From 9d23691e35870c6a7dd1e3afbcda2ab0ceff1f45 Mon Sep 17 00:00:00 2001
From: Chris Recoskie <recoskie@ca.ibm.com>
Date: Sat, 15 Oct 2005 14:49:24 +0000
Subject: [PATCH] crecoskie Oct 15, 2005 - Further changes to support macros in
 buildDefinitions markup.  See Bugzilla 111203

---
 .../makegen/gnu/GnuMakefileGenerator.java     | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 580c84ee916..1bbc6d978fa 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -2358,9 +2358,28 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
 				buffer.append(WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK);
 				// Get the dependency rule out of the generator
 				String depCmd = depGen.getDependencyCommand(resource, info);
-				buffer.append(depCmd);
+
+                // Resolve any macros in the dep command after it has been generated.
+                // Note:  do not trim the result because it will strip out necessary tab characters.
+                try {
+                     depCmd = ManagedBuildManager
+                            .getBuildMacroProvider()
+                            .resolveValueToMakefileFormat(
+                                    depCmd,
+                                    EMPTY_STRING,
+                                    WHITESPACE,
+                                    IBuildMacroProvider.CONTEXT_FILE,
+                                    new FileContextData(sourceLocation,
+                                            outputLocation, null, info
+                                                    .getDefaultConfiguration()
+                                                    .getToolChain()));
+                    
+                } catch (BuildMacroException e) {
+                }
+                
+                buffer.append(depCmd);
 			}
-			
+ 			
 			// Echo finished message
 			buffer.append(NEWLINE);
 			buffer.append(TAB + AT + ECHO + WHITESPACE + SINGLE_QUOTE + MESSAGE_FINISH_FILE + WHITESPACE + IN_MACRO + SINGLE_QUOTE + NEWLINE);