bug 232373: cdt generated make file has options with no spaces between option and argument

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"Sources/sub sources/func 3.d" -MT"Sources/sub\ sources/func\ 3.d" -o"$@" "$<"
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"Sources/sub sources/func 3.d" -MT"Sources/sub\ sources/func\ 3.d" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk

@@ -23,14 +23,14 @@ C_DEPS += \
 Sources/%.o: ../Sources/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 Sources/func2.o: ../Sources/func2.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O3 -g3 -Wall -c -MMD -MP -MF"$(@:%.o=%.d)" -MT"Sources/func2.d" -o"$@" "$<"
+	gcc -I../Headers -I../Sources/sub\ sources -O3 -g3 -Wall -c -MMD -MP -MF"$(@:%.o=%.d)" -MT"Sources/func2.d" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile

@@ -30,7 +30,7 @@ all: test1DepCalc2
 test1DepCalc2: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc  -o"test1DepCalc2" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "test1DepCalc2" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk

@@ -17,9 +17,9 @@ C_DEPS += \
 Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -DFUN3 -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	gcc -DFUN3 -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -DFUN3 -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -DFUN3 -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk

@@ -23,9 +23,9 @@ C_DEPS += \
 Sources/%.o: ../Sources/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile

@@ -30,7 +30,7 @@ all: test1DepCalc3
 test1DepCalc3: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc  -o"test1DepCalc3" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "test1DepCalc3" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk

@@ -17,9 +17,9 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk

@@ -17,13 +17,13 @@ C_DEPS += \
 Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<"
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 Sources/sub\ sources/func\ 3.d: ../Sources/sub\ sources/func\ 3.c
 	@echo 'Regenerating dependency file: $@'
-	gcc -w -MM -MP -MT"Sources/sub\ sources/func\ 3.d" -MT"Sources/sub\ sources/func\ 3.o" -I../Headers -I../Sources/sub\ sources -MF"$@" "$<"
+	gcc -w -MM -MP -MT"Sources/sub\ sources/func\ 3.d" -MT"Sources/sub\ sources/func\ 3.o" -I../Headers -I../Sources/sub\ sources -MF "$@" "$<"
 	@echo ' '
 
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk

@@ -23,13 +23,13 @@ C_DEPS += \
 Sources/%.o: ../Sources/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<"
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 Sources/%.d: ../Sources/%.c
 	@echo 'Regenerating dependency file: $@'
-	gcc -w -MM -MP -MT"$@" -MT"$(@:%.d=%.o)" -I../Headers -I../Sources/sub\ sources -MF"$@" "$<"
+	gcc -w -MM -MP -MT"$@" -MT"$(@:%.d=%.o)" -I../Headers -I../Sources/sub\ sources -MF "$@" "$<"
 	@echo ' '
 
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile

@@ -30,7 +30,7 @@ all: test1DepCalcPreBuild
 test1DepCalcPreBuild: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc  -o"test1DepCalcPreBuild" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "test1DepCalcPreBuild" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk

@@ -17,13 +17,13 @@ C_DEPS += \
 main.o: ../main.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -c -o"$@" "$<"
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -c -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 main.d: ../main.c
 	@echo 'Regenerating dependency file: $@'
-	gcc -w -MM -MP -MT"main.d" -MT"main.o" -I../Headers -I../Sources/sub\ sources -MF"$@" "$<"
+	gcc -w -MM -MP -MT"main.d" -MT"main.o" -I../Headers -I../Sources/sub\ sources -MF "$@" "$<"
 	@echo ' '
 
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile

@@ -43,7 +43,7 @@ all: test12.exe
 test12.exe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cygwin C++ Linker'
-	g++  -o"test12.exe" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++  -o "test12.exe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/subdir.mk

@@ -17,7 +17,7 @@ CPP_DEPS += \
 %.o: ../%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Cygwin C++ Compiler'
-	g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile

@@ -43,7 +43,7 @@ all: test20.exe
 test20.exe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C++ Linker'
-	g++  -o"test20.exe" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++  -o "test20.exe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/subdir.mk

@@ -17,7 +17,7 @@ CPP_DEPS += \
 %.o: ../%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O2 -g1 -pedantic -pedantic-errors -Wall -Werror -c -fmessage-length=0 -v -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -O2 -g1 -pedantic -pedantic-errors -Wall -Werror -c -fmessage-length=0 -v -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 Functions/%.o: ../Functions/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile

@@ -29,7 +29,7 @@ all: MBS2dot1.exe
 MBS2dot1.exe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc  -o"MBS2dot1.exe" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "MBS2dot1.exe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk

@@ -17,7 +17,7 @@ CPP_DEPS += \
 Functions/%.o: ../Functions/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile

@@ -44,7 +44,7 @@ all: Test21CXX
 Test21CXX: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C++ Linker'
-	g++  -o"Test21CXX" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++  -o "Test21CXX" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: liblinkedFolder.a
 liblinkedFolder.a: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: archiver.gnu'
-	ar -r "liblinkedFolder.a" $(OBJS) $(USER_OBJS) $(LIBS)
+	ar -r  "liblinkedFolder.a" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk

@@ -20,9 +20,9 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: liblinkedLib.a
 liblinkedLib.a: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: archiver.gnu'
-	ar -r "liblinkedLib.a" $(OBJS) $(USER_OBJS) $(LIBS)
+	ar -r  "liblinkedLib.a" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk

@@ -20,7 +20,7 @@ C_DEPS += \
 f1.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
 	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
@@ -29,7 +29,7 @@ f1.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1.c
 f2.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f2.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
 	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile

@@ -43,7 +43,7 @@ all: testResCfg
 testResCfg: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: linker.gnu.cpp'
-	g++ --strip-all -o"testResCfg" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ --strip-all -o "testResCfg" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 source1/%.o: ../source1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.cpp'
-	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 source2/source21/Class21.o: ../source2/source21/Class21.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.cpp'
-	g++ -DRESSPEC -I../headers -O0 -g3 -Wall -c -o"$@" "$<" && \
+	g++ -DRESSPEC -I../headers -O0 -g3 -Wall -c -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -DRESSPEC -I../headers -O0 -g3 -Wall -c  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -DRESSPEC -I../headers -O0 -g3 -Wall -c   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 source2/%.o: ../source2/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.cpp'
-	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 %.o: ../%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.cpp'
-	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: testSingleExe
 testSingleExe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: linker.gnu.c'
-	gcc  -o"testSingleExe" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "testSingleExe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk

@@ -17,9 +17,9 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile

@@ -40,7 +40,7 @@ all: libtestDoubleSO.so
 libtestDoubleSO.so: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: linker.gnu.cpp'
-	g++ -shared -o"libtestDoubleSO.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -shared -o "libtestDoubleSO.so" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk

@@ -20,9 +20,9 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: compiler.gnu.cpp'
-	g++ -DXXX -O0 -g3 -Wall -c -o"$@" "$<" && \
+	g++ -DXXX -O0 -g3 -Wall -c -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -DXXX -O0 -g3 -Wall -c  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -DXXX -O0 -g3 -Wall -c   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/makefile

@@ -22,7 +22,7 @@ all: TestATO.out
 TestATO.out: $(OBJS) $(OPT_SRCS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: AssignToOption Executable Linker'
-	ATOL -opt../TestATO1.opt -opt../TestATO2.opt -o"TestATO.out" $(OBJS)
+	ATOL -opt../TestATO1.opt -opt../TestATO2.opt -o "TestATO.out" $(OBJS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/subdir.mk

@@ -21,7 +21,7 @@ OBJS += \
 %.obj: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: AssignToOption Compiler'
-	ATOC -opt../TestATO.cop "$@" "$<"
+	ATOC -opt../TestATO.cop  "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/Functions/subdir.mk

@@ -27,9 +27,9 @@ Functions/%.c: ../Functions/%.x
 Functions/%.o: ./Functions/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/makefile

@@ -38,7 +38,7 @@ TestCopyandDeploy: $(EXECUTABLES)
 
 USER_OBJS.foo: $(OBJS) $(USER_OBJS)
 	@echo 'Invoking: MBS30.linker.gnu.c'
-	gcc  -o"USER_OBJS.foo" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "USER_OBJS.foo" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/subdir.mk

@@ -27,9 +27,9 @@ CS += \
 %.o: ./%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/makefile

@@ -40,7 +40,7 @@ all: DeleteFile
 DeleteFile: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.linker.gnu.cpp'
-	g++  -o"DeleteFile" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++  -o "DeleteFile" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/subdir.mk

@@ -17,9 +17,9 @@ CXX_DEPS += \
 %.o: ../%.cxx
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.cpp'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: inputTypeOption
 inputTypeOption: $(OBJS) C:\An\ Absolute\ Path\ With\ Spaces\foo.linker $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: org.eclipse.cdt.managedbuilder.core.tests.inputTypeOptionMakefileRenderingTest.c.linker'
-	gcc --linkerInputTypeOption="C:\An Absolute Path With Spaces\foo.linker" -o"inputTypeOption" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc --linkerInputTypeOption="C:\An Absolute Path With Spaces\foo.linker" -o "inputTypeOption" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/subdir.mk

@@ -23,27 +23,27 @@ C_DEPS += \
 %.o: ../%.c C:/An\ Absolute\ Path\ With\ Spaces/foo.compiler C:/An\ Absolute\ Path\ With\ Spaces/foo.noquotes.compiler
 	@echo 'Building file: $<'
 	@echo 'Invoking: org.eclipse.cdt.managedbuilder.core.tests.inputTypeOptionMakefileRenderingTest.c.compiler'
-	gcc -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="C:\An Absolute Path With Spaces\foo.compiler" --compilerInputTypeOption=C:\An Absolute Path With Spaces\foo.noquotes.compiler -o"$@" "$<" && \
+	gcc -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="C:\An Absolute Path With Spaces\foo.compiler" --compilerInputTypeOption=C:\An Absolute Path With Spaces\foo.noquotes.compiler -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="C:\An Absolute Path With Spaces\foo.compiler" --compilerInputTypeOption=C:\An Absolute Path With Spaces\foo.noquotes.compiler  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="C:\An Absolute Path With Spaces\foo.compiler" --compilerInputTypeOption=C:\An Absolute Path With Spaces\foo.noquotes.compiler   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 
 resourceSettingAbsoluteCompiler.o: ../resourceSettingAbsoluteCompiler.c D:/An\ Absolute\ Path\ With\ Spaces/resource.foo.compiler D:/An\ Absolute\ Path\ With\ Spaces/resource.foo.noquotes.compiler
 	@echo 'Building file: $<'
 	@echo 'Invoking: org.eclipse.cdt.managedbuilder.core.tests.inputTypeOptionMakefileRenderingTest.c.compiler'
-	gcc -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="D:\An Absolute Path With Spaces\resource.foo.compiler" --compilerInputTypeOption=D:\An Absolute Path With Spaces\resource.foo.noquotes.compiler -o"$@" "$<" && \
+	gcc -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="D:\An Absolute Path With Spaces\resource.foo.compiler" --compilerInputTypeOption=D:\An Absolute Path With Spaces\resource.foo.noquotes.compiler -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="D:\An Absolute Path With Spaces\resource.foo.compiler" --compilerInputTypeOption=D:\An Absolute Path With Spaces\resource.foo.noquotes.compiler  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="D:\An Absolute Path With Spaces\resource.foo.compiler" --compilerInputTypeOption=D:\An Absolute Path With Spaces\resource.foo.noquotes.compiler   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 
 resourceSettingRelativeCompiler.o: ../resourceSettingRelativeCompiler.c ../A\ Folder\ With\ Spaces/foo.compiler ../A\ Folder\ With\ Spaces/foo.noquotes.compiler
 	@echo 'Building file: $<'
 	@echo 'Invoking: org.eclipse.cdt.managedbuilder.core.tests.inputTypeOptionMakefileRenderingTest.c.compiler'
-	gcc -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="A Folder With Spaces/foo.compiler" --compilerInputTypeOption=A Folder With Spaces/foo.noquotes.compiler -o"$@" "$<" && \
+	gcc -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="A Folder With Spaces/foo.compiler" --compilerInputTypeOption=A Folder With Spaces/foo.noquotes.compiler -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="A Folder With Spaces/foo.compiler" --compilerInputTypeOption=A Folder With Spaces/foo.noquotes.compiler  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O3 -Wall -c -fmessage-length=0 -v --compilerInputTypeOption="A Folder With Spaces/foo.compiler" --compilerInputTypeOption=A Folder With Spaces/foo.noquotes.compiler   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: liblinkedFolder.a
 liblinkedFolder.a: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.archiver.gnu'
-	ar -r "liblinkedFolder.a" $(OBJS) $(USER_OBJS) $(LIBS)
+	ar -r  "liblinkedFolder.a" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/subdir.mk

@@ -20,9 +20,9 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: liblinkedLib.a
 liblinkedLib.a: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.archiver.gnu'
-	ar -r "liblinkedLib.a" $(OBJS) $(USER_OBJS) $(LIBS)
+	ar -r  "liblinkedLib.a" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/subdir.mk

@@ -26,7 +26,7 @@ C_DEPS += \
 f1.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f1.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
 	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
@@ -35,7 +35,7 @@ f1.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f1.c
 f1_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1_30.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
 	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
@@ -44,7 +44,7 @@ f1_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1_30.c
 f2.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f2.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
 	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
@@ -53,7 +53,7 @@ f2.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f2.c
 f2_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f2_30.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
 	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/makefile

@@ -43,7 +43,7 @@ all: multiResConfig
 multiResConfig: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.linker.gnu.cpp'
-	g++  -o"multiResConfig" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++  -o "multiResConfig" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source1/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 source1/%.o: ../source1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.cpp'
-	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 source2/source21/Class21.o: ../source2/source21/Class21.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.cpp'
-	g++ -DRESCFG -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -DRESCFG -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -DRESCFG -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -DRESCFG -I../headers -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 source2/%.o: ../source2/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.cpp'
-	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/subdir.mk

@@ -17,9 +17,9 @@ CPP_DEPS += \
 %.o: ../%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.cpp'
-	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/makefile

@@ -43,7 +43,7 @@ main-build: preAndPostBuildSteps
 preAndPostBuildSteps: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.linker.gnu.cpp'
-	g++  -o"preAndPostBuildSteps" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++  -o "preAndPostBuildSteps" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 	$(MAKE) --no-print-directory post-build

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/subdir.mk

@@ -17,9 +17,9 @@ CXX_DEPS += \
 %.o: ../%.cxx
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.cpp'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	g++ -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	g++ -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	g++ -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: rcbsBasicTest
 rcbsBasicTest: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.linker.gnu.c'
-	gcc  -o"rcbsBasicTest" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "rcbsBasicTest" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: singleFileExe
 singleFileExe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.linker.gnu.c'
-	gcc  -o"singleFileExe" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "singleFileExe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/subdir.mk

@@ -17,9 +17,9 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 -v   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/makefile

@@ -29,7 +29,7 @@ all: testwithspaces.exe
 testwithspaces.exe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc  -o"testwithspaces.exe" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "testwithspaces.exe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sub folder with spaces/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 sub\ folder\ with\ spaces/foo\ with\ spaces.o: ../sub\ folder\ with\ spaces/foo\ with\ spaces.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"sub folder with spaces/foo with spaces.d" -MT"sub\ folder\ with\ spaces/foo\ with\ spaces.d" -o"$@" "$<"
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"sub folder with spaces/foo with spaces.d" -MT"sub\ folder\ with\ spaces/foo\ with\ spaces.d" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 main\ with\ spaces.o: ../main\ with\ spaces.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"main with spaces.d" -MT"main\ with\ spaces.d" -o"$@" "$<"
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"main with spaces.d" -MT"main\ with\ spaces.d" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/makefile

@@ -42,7 +42,7 @@ default.so.4.5.6: Test30_1.so.4.5.6 $(EXECUTABLES)
 
 test30_1.so.1.2.3: $(STRIPPEDOBJS)
 	@echo 'Invoking: MBS30.linker.gnu.c'
-	gcc -shared -Wl,-soname=test30_1.so.1.2.3 -o"test30_1.so.1.2.3" $(STRIPPEDOBJS)
+	gcc -shared -Wl,-soname=test30_1.so.1.2.3 -o "test30_1.so.1.2.3" $(STRIPPEDOBJS)
 	@echo 'Finished building: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/subdir.mk

@@ -42,9 +42,9 @@ CDT.bmp: f1.c
 %.oprestripped: ./%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O2 -g -Wall -c -fmessage-length=0 -v -o"$@" "$<" && \
+	gcc -O2 -g -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \
 	echo -n '$(@:%.oprestripped=%.d)' $(dir $@) > '$(@:%.oprestripped=%.d)' && \
-	gcc -MM -MG -P -w -O2 -g -Wall -c -fmessage-length=0 -v  "$<" >> '$(@:%.oprestripped=%.d)'
+	gcc -MM -MG -P -w -O2 -g -Wall -c -fmessage-length=0 -v   "$<" >> '$(@:%.oprestripped=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: test.exe
 test.exe: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC C Linker'
-	gcc  -o"test.exe" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc  -o "test.exe" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/subdir.mk

@@ -17,7 +17,7 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/makefile

@@ -28,7 +28,7 @@ all: libtwoFileSO.SOS
 libtwoFileSO.SOS: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: MBS30.linker.gnu.c'
-	gcc -shared -o"libtwoFileSO.SOS" $(OBJS) $(USER_OBJS) $(LIBS)
+	gcc -shared -o "libtwoFileSO.SOS" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/subdir.mk

@@ -20,9 +20,9 @@ C_DEPS += \
 %.o: ../%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: MBS30.compiler.gnu.c'
-	gcc -O0 -g3 -c -v -o"$@" "$<" && \
+	gcc -O0 -g3 -c -v -o "$@" "$<" && \
 	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
-	gcc -MM -MG -P -w -O0 -g3 -c -v  "$<" >> '$(@:%.o=%.d)'
+	gcc -MM -MG -P -w -O0 -g3 -c -v   "$<" >> '$(@:%.o=%.d)'
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/d3/subdir.mk

@@ -20,7 +20,7 @@ CPP_DEPS += \
 d1/d2/d3/%.o: ../d1/d2/d3/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id3_rel/path -I/d3_abs/path -Ic:/d3_abs/path -I"D:\d3_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id3_rel/path -I/d3_abs/path -Ic:/d3_abs/path -I"D:\d3_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/subdir.mk

@@ -20,14 +20,14 @@ CPP_DEPS += \
 d1/d2/e.o: ../d1/d2/e.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id2_ecpp_rel/path -I../d2_ecpp_proj/rel/path -I/d2_ecpp_abs/path -Ic:/d2_ecpp_abs/path -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -I"D:\d2_ecpp_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"d1/d2/e.d" -o"$@" "$<"
+	g++ -Id2_ecpp_rel/path -I../d2_ecpp_proj/rel/path -I/d2_ecpp_abs/path -Ic:/d2_ecpp_abs/path -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -I"D:\d2_ecpp_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"d1/d2/e.d" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 d1/d2/%.o: ../d1/d2/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/subdir.mk

@@ -23,7 +23,7 @@ CPP_DEPS += \
 d1/%.o: ../d1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/d2_1/subdir.mk

@@ -20,7 +20,7 @@ CPP_DEPS += \
 d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id2_1_rel/path -I/d2_1_abs/path -Ic:/d2_1_abs/path -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -I"D:\d2_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id2_1_rel/path -I/d2_1_abs/path -Ic:/d2_1_abs/path -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -I"D:\d2_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/subdir.mk

@@ -20,7 +20,7 @@ CPP_DEPS += \
 d1_1/%.o: ../d1_1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/asd/subdir.mk

@@ -17,7 +17,7 @@ CPP_DEPS += \
 dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/subdir.mk

@@ -17,7 +17,7 @@ CPP_DEPS += \
 dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/ff/subdir.mk

@@ -24,14 +24,14 @@ CPP_DEPS += \
 dir1/dd/ff/%.o: ../dir1/dd/ff/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.c'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile

@@ -51,7 +51,7 @@ all: test_40
 test_40: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Test 4.0 ToolName.linker.gnu.cpp'
-	g++ -Llib/path/1 -o"test_40" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -Llib/path/1 -o "test_40" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk

@@ -20,7 +20,7 @@ CPP_DEPS += \
 d1/d2/d3/%.o: ../d1/d2/d3/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id3_rel/path -I/d3_abs/path -Ic:/d3_abs/path -I"D:\d3_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id3_rel/path -I/d3_abs/path -Ic:/d3_abs/path -I"D:\d3_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk

@@ -20,14 +20,14 @@ CPP_DEPS += \
 d1/d2/e.o: ../d1/d2/e.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id2_ecpp_rel/path -I../d2_ecpp_proj/rel/path -I/d2_ecpp_abs/path -Ic:/d2_ecpp_abs/path -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -I"D:\d2_ecpp_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"d1/d2/e.d" -o"$@" "$<"
+	g++ -Id2_ecpp_rel/path -I../d2_ecpp_proj/rel/path -I/d2_ecpp_abs/path -Ic:/d2_ecpp_abs/path -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -I"D:\d2_ecpp_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"d1/d2/e.d" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 d1/d2/%.o: ../d1/d2/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk

@@ -23,7 +23,7 @@ CPP_DEPS += \
 d1/%.o: ../d1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -I"D:\d1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -I"D:\d1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk

@@ -20,7 +20,7 @@ CPP_DEPS += \
 d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id2_1_rel/path -I/d2_1_abs/path -Ic:/d2_1_abs/path -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -I"D:\d1_1_docs\incs" -I"D:\d2_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id2_1_rel/path -I/d2_1_abs/path -Ic:/d2_1_abs/path -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -I"D:\d1_1_docs\incs" -I"D:\d2_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk

@@ -20,7 +20,7 @@ CPP_DEPS += \
 d1_1/%.o: ../d1_1/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -I"D:\d1_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -I"D:\d1_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk

@@ -17,7 +17,7 @@ CPP_DEPS += \
 dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk

@@ -17,7 +17,7 @@ CPP_DEPS += \
 dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk

@@ -24,14 +24,14 @@ CPP_DEPS += \
 dir1/dd/ff/%.o: ../dir1/dd/ff/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.c'
-	gcc -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	gcc -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
 dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
-	g++ -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	g++ -O2 -g -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile

@@ -51,7 +51,7 @@ all: test_40
 test_40: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Test 4.0 ToolName.linker.gnu.cpp'
-	g++ -Llib/path/2 -o"test_40" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -Llib/path/2 -o "test_40" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedCommandLineGeneratorTest.java

@@ -39,6 +39,7 @@ public class ManagedCommandLineGeneratorTest extends TestCase {
             "${COMMAND} ${FLAGS} ${OUTPUT_FLAG}",
             "${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}",
             "${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT}",
+            "${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT}",
             "${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}", 
             "${command} ${flags} ${output_flag}${output_prefix}${output} ${WRONG_VAR_NAME}"
         };
@@ -51,12 +52,13 @@ public class ManagedCommandLineGeneratorTest extends TestCase {
     private static String INPUTS_VAL = "[inputs]";
     private static String[] INPUTS_ARRAY_VAL = INPUTS_VAL.split( "\\s" );
     private static String[] commandLineEtalonesForPatterns = {
-            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"" + " " + "\"" + INPUTS_VAL + "\"",
+            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + " " + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"" + " " + "\"" + INPUTS_VAL + "\"",
             COMMAND_VAL,
             COMMAND_VAL + " " + FLAGS_VAL,
             COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL, 
             COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL,
             COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"",
+            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + " " + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"",
             COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"" + " " + "\"" + INPUTS_VAL + "\"",
             COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"" + " " + "${WRONG_VAR_NAME}" };
     
@@ -65,13 +67,7 @@ public class ManagedCommandLineGeneratorTest extends TestCase {
     }
     
     public static Test suite() {
-        TestSuite suite = new TestSuite( ManagedCommandLineGeneratorTest.class.getName() );
+        return new TestSuite(ManagedCommandLineGeneratorTest.class);
-        suite.addTest( new ManagedCommandLineGeneratorTest( "testGetCommandLineGenerator" ) );
-        suite.addTest( new ManagedCommandLineGeneratorTest( "testGenerateCommandLineInfoPatterns" ) );
-        suite.addTest( new ManagedCommandLineGeneratorTest( "testGenerateCommandLineInfoParameters" ) );
-        suite.addTest( new ManagedCommandLineGeneratorTest( "testCustomGenerator" ) );
-        suite.addTest( new ManagedCommandLineGeneratorTest( "testDollarValue" ) );
-        return suite;
     }
     
     public final void testGetCommandLineGenerator() {
@@ -92,32 +88,41 @@ public class ManagedCommandLineGeneratorTest extends TestCase {
         }
     }
     
-    public final void testGenerateCommandLineInfoParameters() {
+    public final void testGenerateCommandLineInfoDoublePattern() {
         IManagedCommandLineGenerator gen = ManagedCommandLineGenerator.getCommandLineGenerator();
         
-        IManagedCommandLineInfo info = gen.generateCommandLineInfo( null, "", FLAGS_ARRAY_VAL, OUTPUT_FLAG_VAL, OUTPUT_PREFIX_VAL, OUTPUT_VAL, INPUTS_ARRAY_VAL, null );
+        IManagedCommandLineInfo info = gen.generateCommandLineInfo( null, COMMAND_VAL, FLAGS_ARRAY_VAL, OUTPUT_FLAG_VAL, OUTPUT_PREFIX_VAL, OUTPUT_VAL, INPUTS_ARRAY_VAL,
+                "${OUTPUT_FLAG} ${OUTPUT_FLAG}" );
         assertNotNull( info );
-        assertEquals(FLAGS_VAL+" "+OUTPUT_FLAG_VAL+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
+        assertEquals(OUTPUT_FLAG_VAL+" "+OUTPUT_FLAG_VAL, info.getCommandLine());
+    }
+    
+    public final void testGenerateCommandLineInfoParameters() {
+    	IManagedCommandLineGenerator gen = ManagedCommandLineGenerator.getCommandLineGenerator();
+    	
+    	IManagedCommandLineInfo info = gen.generateCommandLineInfo( null, "", FLAGS_ARRAY_VAL, OUTPUT_FLAG_VAL, OUTPUT_PREFIX_VAL, OUTPUT_VAL, INPUTS_ARRAY_VAL, null );
+    	assertNotNull( info );
+    	assertEquals(FLAGS_VAL+" "+OUTPUT_FLAG_VAL+" "+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
         
         info = gen.generateCommandLineInfo( null, COMMAND_VAL, new String[0], OUTPUT_FLAG_VAL, OUTPUT_PREFIX_VAL, OUTPUT_VAL, INPUTS_ARRAY_VAL, null );
         assertNotNull( info );
-        assertEquals(COMMAND_VAL+"  "+OUTPUT_FLAG_VAL+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
+        assertEquals(COMMAND_VAL+"  "+OUTPUT_FLAG_VAL+" "+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
         
         info = gen.generateCommandLineInfo( null, COMMAND_VAL, FLAGS_ARRAY_VAL, "", OUTPUT_PREFIX_VAL, OUTPUT_VAL, INPUTS_ARRAY_VAL, null );
         assertNotNull( info );
-        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+" "+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
+        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+"  "+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
         
         info = gen.generateCommandLineInfo( null, COMMAND_VAL, FLAGS_ARRAY_VAL, OUTPUT_FLAG_VAL, "", OUTPUT_VAL, INPUTS_ARRAY_VAL, null );
         assertNotNull( info );
-        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+" "+OUTPUT_FLAG_VAL + "\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
+        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+" "+OUTPUT_FLAG_VAL+" "+"\""+OUTPUT_VAL + "\""+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
         
         info = gen.generateCommandLineInfo( null, COMMAND_VAL, FLAGS_ARRAY_VAL, OUTPUT_FLAG_VAL, OUTPUT_PREFIX_VAL, "", INPUTS_ARRAY_VAL, null );
         assertNotNull( info );
-        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+" "+OUTPUT_FLAG_VAL+OUTPUT_PREFIX_VAL+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
+        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+" "+OUTPUT_FLAG_VAL+" "+OUTPUT_PREFIX_VAL+" " + "\""+INPUTS_VAL + "\"", info.getCommandLine());
         
         info = gen.generateCommandLineInfo( null, COMMAND_VAL, FLAGS_ARRAY_VAL, OUTPUT_FLAG_VAL, OUTPUT_PREFIX_VAL, OUTPUT_VAL, new String[0], null );
         assertNotNull( info );
-        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+" "+OUTPUT_FLAG_VAL+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\"", info.getCommandLine());
+        assertEquals(COMMAND_VAL+" "+FLAGS_VAL+" "+OUTPUT_FLAG_VAL+" "+OUTPUT_PREFIX_VAL + "\""+OUTPUT_VAL + "\"", info.getCommandLine());
     }
 
     public final void testCustomGenerator() {

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java

@@ -57,6 +57,10 @@ public class ManagedCommandLineGenerator implements
 		return cmdLineGen;
 	}
 	
+	private String makeVariable(String variableName) {
+		return "${"+variableName+"}"; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IManagedCommandLineGenerator#getCommandLineInfo(org.eclipse.cdt.managedbuilder.core.ITool, java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String[], java.lang.String)
 	 */
@@ -65,78 +69,45 @@ public class ManagedCommandLineGenerator implements
 			String outputPrefix, String outputName, 
 			String[] inputResources, String commandLinePattern) 
 	{
-		StringBuffer sb = new StringBuffer();
 		if( commandLinePattern == null || commandLinePattern.length() <= 0 )
-		    commandLinePattern = Tool.DEFAULT_PATTERN;
+			commandLinePattern = Tool.DEFAULT_PATTERN;
-/*		    
+		
-			sb.append( commandName + WHITESPACE + stringArrayToString( flags ) + WHITESPACE + outputFlag + WHITESPACE + outputPrefix + 
+		// if the output name isn't a variable then quote it
-				outputName + WHITESPACE + stringArrayToString( inputResources ) );
+		if(outputName.length()>0 && outputName.indexOf("$(") != 0) //$NON-NLS-1$
-		else {
+			outputName = DOUBLE_QUOTE + outputName + DOUBLE_QUOTE;
-*/		    
+		
-			int start =  0;
+		String inputsStr=""; //$NON-NLS-1$
-			int stop = 0;
+		for (String inp : inputResources) {
-			while( (start = commandLinePattern.indexOf( VAR_FIRST_CHAR, start )) >= 0 ) {
+			if(inp!=null && inp.length()>0) {
-				if( commandLinePattern.charAt( start + 1 ) != VAR_SECOND_CHAR  ) {
+				// if the input resource isn't a variable then quote it
-					sb.append(VAR_FIRST_CHAR);
+				if(inp.indexOf("$(") != 0) { //$NON-NLS-1$
-					start++;
+					inp = DOUBLE_QUOTE + inp + DOUBLE_QUOTE;
-					continue;
 				}
-				if( start > stop ) {
+				inputsStr = inputsStr + inp + WHITESPACE;
-					sb.append( commandLinePattern.substring(stop, start) );
+			}
-				}
-				stop = commandLinePattern.indexOf( VAR_FINAL_CHAR, start + 1 );
-				if( stop > 0 && stop <= commandLinePattern.length() ) try {
-					String varName = commandLinePattern.substring( start+2, stop ).trim();
-					if( varName.compareToIgnoreCase( CMD_LINE_PRM_NAME ) == 0 ) sb.append( commandName.trim() );
-					else if( varName.compareToIgnoreCase( FLAGS_PRM_NAME ) == 0 ) sb.append( stringArrayToString( flags ) );
-					else if( varName.compareToIgnoreCase( OUTPUT_FLAG_PRM_NAME ) == 0 ) sb.append( outputFlag.trim() );
-					else if( varName.compareToIgnoreCase( OUTPUT_PREFIX_PRM_NAME ) == 0 ) sb.append( outputPrefix.trim() );
-					else if( varName.compareToIgnoreCase( OUTPUT_PRM_NAME ) == 0 )
-						{
-							StringBuffer tempBuffer = new StringBuffer(EMPTY);
-						
-							if(!outputName.equals(EMPTY))
-							{
-//								 if the output name isn't a variable then quote it
-								if(outputName.indexOf("$(") != 0) //$NON-NLS-1$
-									tempBuffer.append( DOUBLE_QUOTE + outputName + DOUBLE_QUOTE);
-								else
-									tempBuffer.append(outputName);
-							}
-							
-							sb.append(tempBuffer.toString().trim());
-						}
-					else if( varName.compareToIgnoreCase( INPUTS_PRM_NAME ) == 0 && 
-							(inputResources != null)){
-						StringBuffer tempBuffer = new StringBuffer(EMPTY);
-						for(int k = 0; k < inputResources.length; k++)
-						{
-							if(!inputResources[k].equals(EMPTY))
-							{
-								// if the input resource isn't a variable then quote it
-								if(inputResources[k].indexOf("$(") != 0) //$NON-NLS-1$
-									tempBuffer.append(DOUBLE_QUOTE + inputResources[k] + DOUBLE_QUOTE + WHITESPACE);
-								else
-									tempBuffer.append(inputResources[k] + WHITESPACE);
-							}
-						}
-						
-						sb.append(tempBuffer.toString().trim());
-						
-					}
-					else sb.append( VAR_FIRST_CHAR + VAR_SECOND_CHAR + varName + VAR_FINAL_CHAR );
-				} catch( Exception ex ) {
-					// 	do nothing for a while
-				}
-				start = ++stop;
-//			}
-		}
-		if (stop<commandLinePattern.length()){
-			sb.append(commandLinePattern.substring(stop));
 		}
+		inputsStr = inputsStr.trim();
+		
+		String flagsStr = stringArrayToString(flags);
+		
+		String command = commandLinePattern;
 
-		return new ManagedCommandLineInfo( sb.toString().trim(), commandLinePattern, commandName, stringArrayToString( flags ),
+		command = command.replace(makeVariable(CMD_LINE_PRM_NAME), commandName);
-				outputFlag, outputPrefix, outputName, stringArrayToString( inputResources ) );
+		command = command.replace(makeVariable(FLAGS_PRM_NAME), flagsStr);
+		command = command.replace(makeVariable(OUTPUT_FLAG_PRM_NAME), outputFlag);
+		command = command.replace(makeVariable(OUTPUT_PREFIX_PRM_NAME), outputPrefix);
+		command = command.replace(makeVariable(OUTPUT_PRM_NAME), outputName);
+		command = command.replace(makeVariable(INPUTS_PRM_NAME), inputsStr);
+		
+		command = command.replace(makeVariable(CMD_LINE_PRM_NAME.toLowerCase()), commandName);
+		command = command.replace(makeVariable(FLAGS_PRM_NAME.toLowerCase()), flagsStr);
+		command = command.replace(makeVariable(OUTPUT_FLAG_PRM_NAME.toLowerCase()), outputFlag);
+		command = command.replace(makeVariable(OUTPUT_PREFIX_PRM_NAME.toLowerCase()), outputPrefix);
+		command = command.replace(makeVariable(OUTPUT_PRM_NAME.toLowerCase()), outputName);
+		command = command.replace(makeVariable(INPUTS_PRM_NAME.toLowerCase()), inputsStr);
+
+		return new ManagedCommandLineInfo(command.trim(), commandLinePattern, commandName, stringArrayToString(flags),
+				outputFlag, outputPrefix, outputName, stringArrayToString(inputResources));
 	}
 	
 	private String stringArrayToString( String[] array ) {

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java

@@ -92,7 +92,7 @@ import org.osgi.framework.Version;
  */
 public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatchKeyProvider, IRealBuildObjectAssociation {
 
-	public static final String DEFAULT_PATTERN = "${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"; //$NON-NLS-1$
+	public static final String DEFAULT_PATTERN = "${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"; //$NON-NLS-1$
 	public static final String DEFAULT_CBS_PATTERN = "${COMMAND}"; //$NON-NLS-1$
 
 	//property name for holding the rebuild state