Bug 412346: Makefile Editor: F3 navigation to user defined functions from $(call user-fun)

1 files changed, 23 insertions, 21 deletions

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileConstants.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileConstants.java
index cb50a7e8b4c..b3b7b78edb6 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileConstants.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileConstants.java
@@ -14,29 +14,31 @@ import org.eclipse.cdt.make.internal.core.makefile.MakeFileConstants;
 
 
 public class GNUMakefileConstants extends MakeFileConstants {
-    static final String CONDITIONAL_ELSE = "else"; //$NON-NLS-1$
-    static final String CONDITIONAL_IFNEQ = "ifneq";  //$NON-NLS-1$
-    static final String CONDITIONAL_IFNDEF = "ifndef"; //$NON-NLS-1$
-    static final String CONDITIONAL_IFEQ = "ifeq"; //$NON-NLS-1$
-    static final String CONDITIONAL_IFDEF = "ifdef"; //$NON-NLS-1$
+    public static final String CONDITIONAL_ELSE = "else"; //$NON-NLS-1$
+    public static final String CONDITIONAL_IFNEQ = "ifneq";  //$NON-NLS-1$
+    public static final String CONDITIONAL_IFNDEF = "ifndef"; //$NON-NLS-1$
+    public static final String CONDITIONAL_IFEQ = "ifeq"; //$NON-NLS-1$
+    public static final String CONDITIONAL_IFDEF = "ifdef"; //$NON-NLS-1$
  
-    static final String TERMINAL_ENDEF = "endef"; //$NON-NLS-1$
-    static final String TERMINAL_ENDIF = "endif"; //$NON-NLS-1$
+    public static final String TERMINAL_ENDEF = "endef"; //$NON-NLS-1$
+    public static final String TERMINAL_ENDIF = "endif"; //$NON-NLS-1$
 
-    static final String DIRECTIVE_VPATH = "vpath"; //$NON-NLS-1$
-    static final String DIRECTIVE_UNEXPORT = "unexport"; //$NON-NLS-1$
+    public static final String DIRECTIVE_VPATH = "vpath"; //$NON-NLS-1$
+    public static final String DIRECTIVE_UNEXPORT = "unexport"; //$NON-NLS-1$
     
-    static final String VARIABLE_DEFINE = "define"; //$NON-NLS-1$
-    static final String VARIABLE_EXPORT = "export"; //$NON-NLS-1$
-    static final String VARIABLE_OVERRIDE = "override"; //$NON-NLS-1$
-    
-    static final String DIRECTIVE_INCLUDE =  "include"; //$NON-NLS-1$
+    public static final String VARIABLE_DEFINE = "define"; //$NON-NLS-1$
+    public static final String VARIABLE_EXPORT = "export"; //$NON-NLS-1$
+    public static final String VARIABLE_OVERRIDE = "override"; //$NON-NLS-1$
+
+    public static final String FUNCTION_CALL = "call"; //$NON-NLS-1$
+
+    public static final String DIRECTIVE_INCLUDE =  "include"; //$NON-NLS-1$
 
-    static final String RULE_DELETE_ON_ERROR = ".DELETE_ON_ERROR";  //$NON-NLS-1$
-    static final String RULE_PHONY = ".PHONY"; //$NON-NLS-1$
-    static final String RULE_SECONDARY = ".SECONDARY"; //$NON-NLS-1$
-    static final String RULE_LOW_RESOLUTION_TIME = ".LOW_RESOLUTION_TIME"; //$NON-NLS-1$
-    static final String RULE_NOT_PARALLEL = ".NOTPARALLEL"; //$NON-NLS-1$
-    static final String RULE_EXPORT_ALL_VARIABLES = ".EXPORT_ALL_VARIABLES"; //$NON-NLS-1$
-    static final String RULE_INTERMEDIATE = ".INTERMEDIATE"; //$NON-NLS-1$
+    public static final String RULE_DELETE_ON_ERROR = ".DELETE_ON_ERROR";  //$NON-NLS-1$
+    public static final String RULE_PHONY = ".PHONY"; //$NON-NLS-1$
+    public static final String RULE_SECONDARY = ".SECONDARY"; //$NON-NLS-1$
+    public static final String RULE_LOW_RESOLUTION_TIME = ".LOW_RESOLUTION_TIME"; //$NON-NLS-1$
+    public static final String RULE_NOT_PARALLEL = ".NOTPARALLEL"; //$NON-NLS-1$
+    public static final String RULE_EXPORT_ALL_VARIABLES = ".EXPORT_ALL_VARIABLES"; //$NON-NLS-1$
+    public static final String RULE_INTERMEDIATE = ".INTERMEDIATE"; //$NON-NLS-1$
 }