Hook up the old Include Paths and Symbols page to Makefile projs.

Makefile projects depend on build output parsing to pick up
compiler options to use while indexing. Sometimes, that just
doesn't work. As a back up we've always allowed users to manually
add them to the project. Long ago when we had pure make projects
we had UI for this. This change hooks that old UI up. It was a
time before build configs so they get applied to them all but it
serves it's role as a backup when users run into problems.

Unmarked everything I use here from deprecated until we decide
how to replace these with Core build config aware settings.

Change-Id: I6fc4d48e5315df3c60c7591b026ae0a53a1f505e

2 files changed, 6 insertions, 2 deletions

diff --git a/build/org.eclipse.cdt.make.core/templates/simple/Makefile b/build/org.eclipse.cdt.make.core/templates/simple/Makefile
index 8214dabe9d1..bcf0bb59a77 100644
--- a/build/org.eclipse.cdt.make.core/templates/simple/Makefile
+++ b/build/org.eclipse.cdt.make.core/templates/simple/Makefile
@@ -4,6 +4,10 @@ OBJS = ${projectName}.o
 

 ifeq ($(BUILD_MODE),debug)

 	CFLAGS += -g

+else ifeq ($(BUILD_MODE),run)

+	CFLAGS += -O2

+else

+	$(error Build mode $(BUILD_MODE) not supported by this Makefile)

 endif

 

 all:	${projectName}

diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index e4c1f7bbd09..6f3fb11cb0d 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -197,7 +197,7 @@
    </extension>
    <extension
          point="org.eclipse.ui.propertyPages">
-      <page
+      <!--page
             objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
             name="%PropertyMakeProject.name"
@@ -220,7 +220,7 @@
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
       </page> 
-      <!--page
+      <page
             objectClass="org.eclipse.cdt.core.model.ICContainer"
             name="%IncludeSymbolProperties.name"
             class="org.eclipse.cdt.internal.ui.dialogs.cpaths.IncludesSymbolsPropertyPage"