diff options
95 files changed, 336 insertions, 123 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk index 4f13ad7bb00..1c601547fb2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c +Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c Sources/sub\ sources/subdir.mk @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"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk index 9c19080ee54..c374cff7b6c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk @@ -20,14 +20,14 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Sources/%.o: ../Sources/%.c +Sources/%.o: ../Sources/%.c Sources/subdir.mk @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 "$@" "$<" @echo 'Finished building: $<' @echo ' ' -Sources/func2.o: ../Sources/func2.c +Sources/func2.o: ../Sources/func2.c Sources/subdir.mk @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"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile index 5444950ed86..74608dc04e7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile @@ -21,6 +21,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test1DepCalc2 BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -32,7 +38,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test1DepCalc2 # Tool invocations -test1DepCalc2: $(OBJS) $(USER_OBJS) +test1DepCalc2: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' gcc -o "test1DepCalc2" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk index d083eef3ec2..aac4e34c0d4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk index b57047e3c84..1575edc4d94 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c +Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c Sources/sub\ sources/subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -DFUN3 -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk index d28149917bb..8e78ab847a6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk @@ -20,7 +20,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Sources/%.o: ../Sources/%.c +Sources/%.o: ../Sources/%.c Sources/subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile index 06f9ede2622..540caf590eb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile @@ -21,6 +21,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test1DepCalc3 BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -32,7 +38,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test1DepCalc3 # Tool invocations -test1DepCalc3: $(OBJS) $(USER_OBJS) +test1DepCalc3: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' gcc -o "test1DepCalc3" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk index cfe94fcc9b5..841c42319b9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk index 30264c8f857..ce3ac38524a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk @@ -14,14 +14,14 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c +Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c Sources/sub\ sources/subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' 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 +Sources/sub\ sources/func\ 3.d: ../Sources/sub\ sources/func\ 3.c Sources/sub\ sources/subdir.mk @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 "$@" "$<" @echo ' ' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk index 3a9269b7967..51ed93728d7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk @@ -20,14 +20,14 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Sources/%.o: ../Sources/%.c +Sources/%.o: ../Sources/%.c Sources/subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' -Sources/%.d: ../Sources/%.c +Sources/%.d: ../Sources/%.c Sources/subdir.mk @echo 'Regenerating dependency file: $@' gcc -w -MM -MP -MT"$@" -MT"$(@:%.d=%.o)" -I../Headers -I../Sources/sub\ sources -MF "$@" "$<" @echo ' ' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile index 1dbf600f1e5..936414405e8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile @@ -21,6 +21,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test1DepCalcPreBuild BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -32,7 +38,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test1DepCalcPreBuild # Tool invocations -test1DepCalcPreBuild: $(OBJS) $(USER_OBJS) +test1DepCalcPreBuild: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' gcc -o "test1DepCalcPreBuild" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk index 54c7f597e00..8b129eaeebf 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk @@ -14,14 +14,14 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -main.o: ../main.c +main.o: ../main.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' -main.d: ../main.c +main.d: ../main.c subdir.mk @echo 'Regenerating dependency file: $@' gcc -w -MM -MP -MT"main.d" -MT"main.o" -I../Headers -I../Sources/sub\ sources -MF "$@" "$<" @echo ' ' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile index 04874368bc8..f1f77528ea9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile @@ -34,6 +34,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test12 BUILD_ARTIFACT_EXTENSION := exe BUILD_ARTIFACT_PREFIX := @@ -45,7 +51,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test12.exe # Tool invocations -test12.exe: $(OBJS) $(USER_OBJS) +test12.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Cygwin C++ Linker' g++ -o "test12.exe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/subdir.mk index 58a8f140496..5113087a41b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.cpp +%.o: ../%.cpp subdir.mk @echo 'Building file: $<' @echo 'Invoking: Cygwin C++ Compiler' g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile index 86e91966448..bb6c2770670 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile @@ -34,6 +34,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test20 BUILD_ARTIFACT_EXTENSION := exe BUILD_ARTIFACT_PREFIX := @@ -45,7 +51,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test20.exe # Tool invocations -test20.exe: $(OBJS) $(USER_OBJS) +test20.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C++ Linker' g++ -o "test20.exe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/subdir.mk index 4625fb0c504..3a0326d3961 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.cpp +%.o: ../%.cpp subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk index 2cd4a4dff69..a139059c11b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Functions/%.o: ../Functions/%.c +Functions/%.o: ../Functions/%.c Functions/subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile index 2b4c3683a76..3a9a678f846 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile @@ -20,6 +20,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := MBS2dot1 BUILD_ARTIFACT_EXTENSION := exe BUILD_ARTIFACT_PREFIX := @@ -31,7 +37,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: MBS2dot1.exe # Tool invocations -MBS2dot1.exe: $(OBJS) $(USER_OBJS) +MBS2dot1.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' gcc -o "MBS2dot1.exe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk index c6d13b6a4ef..7a64a0ade1c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk index 7774d58461b..4a1a23636a3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Functions/%.o: ../Functions/%.cpp +Functions/%.o: ../Functions/%.cpp Functions/subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile index c56fa84b89f..7ed3bd0e575 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile @@ -35,6 +35,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := Test21CXX BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -46,7 +52,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: Test21CXX # Tool invocations -Test21CXX: $(OBJS) $(USER_OBJS) +Test21CXX: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C++ Linker' g++ -o "Test21CXX" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk index fa4c19e5afb..e13baec2c3b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile index 3432d4183ed..c015ad72512 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := linkedFolder BUILD_ARTIFACT_EXTENSION := a BUILD_ARTIFACT_PREFIX := lib @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: liblinkedFolder.a # Tool invocations -liblinkedFolder.a: $(OBJS) $(USER_OBJS) +liblinkedFolder.a: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: archiver.gnu' ar -r "liblinkedFolder.a" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk index 0c0b84721bd..430867f3074 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk @@ -17,7 +17,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile index 16114566632..1416807e374 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := linkedLib BUILD_ARTIFACT_EXTENSION := a BUILD_ARTIFACT_PREFIX := lib @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: liblinkedLib.a # Tool invocations -liblinkedLib.a: $(OBJS) $(USER_OBJS) +liblinkedLib.a: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: archiver.gnu' ar -r "liblinkedLib.a" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk index f01f20660df..67a1c0e3bd0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk @@ -17,7 +17,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -f1.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1.c +f1.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ @@ -26,7 +26,7 @@ f1.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1.c @echo 'Finished building: $<' @echo ' ' -f2.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f2.c +f2.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f2.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile index f5b5bc1f0e5..ef2c7497f16 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile @@ -34,6 +34,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := testResCfg BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -45,7 +51,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: testResCfg # Tool invocations -testResCfg: $(OBJS) $(USER_OBJS) +testResCfg: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: linker.gnu.cpp' g++ --strip-all -o "testResCfg" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk index e3c307e75f5..cc468bedb90 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -source1/%.o: ../source1/%.cpp +source1/%.o: ../source1/%.cpp source1/subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.cpp' g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk index 5a1ad29cc54..7da2b23727a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -source2/source21/Class21.o: ../source2/source21/Class21.cpp +source2/source21/Class21.o: ../source2/source21/Class21.cpp source2/source21/subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.cpp' g++ -DRESSPEC -I../headers -O0 -g3 -Wall -c -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk index a612bf4fc07..d3122caaf55 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -source2/%.o: ../source2/%.cpp +source2/%.o: ../source2/%.cpp source2/subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.cpp' g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk index 56c172ea389..2b451f51dfc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.cpp +%.o: ../%.cpp subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.cpp' g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile index 27b807055e3..799f3150459 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := testSingleExe BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: testSingleExe # Tool invocations -testSingleExe: $(OBJS) $(USER_OBJS) +testSingleExe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: linker.gnu.c' gcc -o "testSingleExe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk index 902f1b1c8ac..1bf4cdc46b8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile index 07be09b254f..25b75513c6f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile @@ -31,6 +31,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := testDoubleSO BUILD_ARTIFACT_EXTENSION := so BUILD_ARTIFACT_PREFIX := lib @@ -42,7 +48,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: libtestDoubleSO.so # Tool invocations -libtestDoubleSO.so: $(OBJS) $(USER_OBJS) +libtestDoubleSO.so: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: linker.gnu.cpp' g++ -shared -o "libtestDoubleSO.so" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk index 0e0b407c30d..2c13b3e3897 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk @@ -17,7 +17,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: compiler.gnu.cpp' g++ -DXXX -O0 -g3 -Wall -c -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/makefile index a7abe7f529f..84051ebd086 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/makefile @@ -13,6 +13,12 @@ RM := rm -rf -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := CDTFortranTest1 BUILD_ARTIFACT_EXTENSION := exe BUILD_ARTIFACT_PREFIX := @@ -24,7 +30,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: CDTFortranTest1.exe # Tool invocations -CDTFortranTest1.exe: $(OBJS) $(USER_OBJS) +CDTFortranTest1.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Linker' mylink -o "CDTFortranTest1.exe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/subdir.mk index e1ac7090213..4aa9c0370f2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/subdir.mk @@ -15,7 +15,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -%.obj: ../%.F90 +%.obj: ../%.F90 subdir.mk @echo 'Building file: $<' @echo 'Invoking: Test Fortran Compiler' myfort -c -object:"$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/Sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/Sources/subdir.mk index ec92de6e7de..c3d8646f878 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/Sources/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/Sources/subdir.mk @@ -87,7 +87,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -Sources/%.obj: ../Sources/%.f90 +Sources/%.obj: ../Sources/%.f90 Sources/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Test Fortran Compiler' myfort -c -object:"$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/makefile index a3ad1a51d41..c0e2564bd35 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/makefile @@ -15,6 +15,12 @@ RM := rm -rf -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := CDTFortranTest2 BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -26,7 +32,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: CDTFortranTest2 # Tool invocations -CDTFortranTest2: $(OBJS) $(USER_OBJS) +CDTFortranTest2: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Linker' mylink -o "CDTFortranTest2" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/module/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/module/subdir.mk index 262ac77a261..36bd730425e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/module/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/module/subdir.mk @@ -69,7 +69,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -module/%.obj: ../module/%.f90 +module/%.obj: ../module/%.f90 module/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Test Fortran Compiler' myfort -c -object:"$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/makefile index 167c97cb187..bcf69ccb3b2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/makefile @@ -13,6 +13,12 @@ RM := rm -rf -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := TestATO BUILD_ARTIFACT_EXTENSION := out BUILD_ARTIFACT_PREFIX := @@ -24,7 +30,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: TestATO.out # Tool invocations -TestATO.out: $(OBJS) $(OPT_SRCS) +TestATO.out: $(OBJS) $(OPT_SRCS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: AssignToOption Executable Linker' ATOL -opt../TestATO1.opt -opt../TestATO2.opt -o "TestATO.out" $(OBJS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/subdir.mk index a40307dddcd..63b90aca961 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/subdir.mk @@ -18,7 +18,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -%.obj: ../%.c +%.obj: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: AssignToOption Compiler' ATOC -opt../TestATO.cop "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/Functions/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/Functions/subdir.mk index 11bdb3bda0b..e8961066bf3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/Functions/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/Functions/subdir.mk @@ -17,14 +17,14 @@ CS += \ # Each subdirectory must supply rules for building sources it contributes -Functions/%.c: ../Functions/%.x +Functions/%.c: ../Functions/%.x Functions/subdir.mk @echo 'Building file: $<' @echo 'Invoking: Copy tool' cp "$<" "$@" @echo 'Finished building: $<' @echo ' ' -Functions/%.o: ./Functions/%.c +Functions/%.o: ./Functions/%.c Functions/subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/makefile index b0d3220b2f0..d9a6356d9de 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/makefile @@ -20,6 +20,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := TestCopyandDeploy BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -34,14 +40,14 @@ USER_OBJS.foo \ all: TestCopyandDeploy # Tool invocations -TestCopyandDeploy: $(EXECUTABLES) +TestCopyandDeploy: $(EXECUTABLES) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Deploy tool' cp $(EXECUTABLES) "TestCopyandDeploy" @echo 'Finished building target: $@' @echo ' ' -USER_OBJS.foo: $(OBJS) $(USER_OBJS) +USER_OBJS.foo: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Invoking: MBS30.linker.gnu.c' gcc -o "USER_OBJS.foo" $(OBJS) $(USER_OBJS) $(LIBS) @echo 'Finished building: $@' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/subdir.mk index 53d386b9c5e..6e7f4178ca1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/subdir.mk @@ -17,14 +17,14 @@ CS += \ # Each subdirectory must supply rules for building sources it contributes -%.c: ../%.x +%.c: ../%.x subdir.mk @echo 'Building file: $<' @echo 'Invoking: Copy tool' cp "$<" "$@" @echo 'Finished building: $<' @echo ' ' -%.o: ./%.c +%.o: ./%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/makefile index 2b5ce8fc338..726351757f5 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/makefile @@ -31,6 +31,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := DeleteFile BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -42,7 +48,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: DeleteFile # Tool invocations -DeleteFile: $(OBJS) $(USER_OBJS) +DeleteFile: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.linker.gnu.cpp' g++ -o "DeleteFile" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/subdir.mk index f904abd99d5..21fbf3cff42 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ CXX_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.cxx +%.o: ../%.cxx subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.cpp' g++ -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/makefile index c3c45f783d6..6a0e06faa11 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := inputTypeOption BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: inputTypeOption # Tool invocations -inputTypeOption: $(OBJS) C:\An\ Absolute\ Path\ With\ Spaces\foo.linker $(USER_OBJS) +inputTypeOption: $(OBJS) C:\An\ Absolute\ Path\ With\ Spaces\foo.linker $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @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) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/subdir.mk index d12dc805385..33a7af3fcce 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/inputTypeOption/Benchmarks/subdir.mk @@ -20,7 +20,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c C:/An\ Absolute\ Path\ With\ Spaces/foo.compiler C:/An\ Absolute\ Path\ With\ Spaces/foo.noquotes.compiler +%.o: ../%.c C:/An\ Absolute\ Path\ With\ Spaces/foo.compiler C:/An\ Absolute\ Path\ With\ Spaces/foo.noquotes.compiler subdir.mk @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 "$@" "$<" && \ @@ -29,7 +29,7 @@ C_DEPS += \ @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 +resourceSettingAbsoluteCompiler.o: ../resourceSettingAbsoluteCompiler.c D:/An\ Absolute\ Path\ With\ Spaces/resource.foo.compiler D:/An\ Absolute\ Path\ With\ Spaces/resource.foo.noquotes.compiler subdir.mk @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 "$@" "$<" && \ @@ -38,7 +38,7 @@ resourceSettingAbsoluteCompiler.o: ../resourceSettingAbsoluteCompiler.c D:/An\ A @echo 'Finished building: $<' @echo ' ' -resourceSettingRelativeCompiler.o: ../resourceSettingRelativeCompiler.c ../A\ Folder\ With\ Spaces/foo.compiler ../A\ Folder\ With\ Spaces/foo.noquotes.compiler +resourceSettingRelativeCompiler.o: ../resourceSettingRelativeCompiler.c ../A\ Folder\ With\ Spaces/foo.compiler ../A\ Folder\ With\ Spaces/foo.noquotes.compiler subdir.mk @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 "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/makefile index 6fc6cb6815d..dd1231944ad 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := linkedFolder BUILD_ARTIFACT_EXTENSION := a BUILD_ARTIFACT_PREFIX := lib @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: liblinkedFolder.a # Tool invocations -liblinkedFolder.a: $(OBJS) $(USER_OBJS) +liblinkedFolder.a: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.archiver.gnu' ar -r "liblinkedFolder.a" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/subdir.mk index cc179c7df35..2af2b9a5183 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/subdir.mk @@ -17,7 +17,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/makefile index a943aff2ee4..563a6f7e3d7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := linkedLib BUILD_ARTIFACT_EXTENSION := a BUILD_ARTIFACT_PREFIX := lib @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: liblinkedLib.a # Tool invocations -liblinkedLib.a: $(OBJS) $(USER_OBJS) +liblinkedLib.a: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.archiver.gnu' ar -r "liblinkedLib.a" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/subdir.mk index b0e33f4ed19..e4d808c4b27 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/subdir.mk @@ -23,7 +23,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -f1.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f1.c +f1.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f1.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ @@ -32,7 +32,7 @@ f1.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f1.c @echo 'Finished building: $<' @echo ' ' -f1_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1_30.c +f1_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1_30.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ @@ -41,7 +41,7 @@ f1_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1_30.c @echo 'Finished building: $<' @echo ' ' -f2.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f2.c +f2.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f2.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ @@ -50,7 +50,7 @@ f2.o: C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f2.c @echo 'Finished building: $<' @echo ' ' -f2_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f2_30.c +f2_30.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f2_30.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/makefile index 5bb098d6923..69357f3dc72 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/makefile @@ -34,6 +34,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := multiResConfig BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -45,7 +51,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: multiResConfig # Tool invocations -multiResConfig: $(OBJS) $(USER_OBJS) +multiResConfig: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.linker.gnu.cpp' g++ -o "multiResConfig" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source1/subdir.mk index c62e8751044..e2b1b36a7e8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source1/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -source1/%.o: ../source1/%.cpp +source1/%.o: ../source1/%.cpp source1/subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.cpp' g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk index 8a20f3227dc..5263b93e8a2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -source2/source21/Class21.o: ../source2/source21/Class21.cpp +source2/source21/Class21.o: ../source2/source21/Class21.cpp source2/source21/subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.cpp' g++ -DRESCFG -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/subdir.mk index ff0ad8f01d1..fa784c05e04 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/source2/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -source2/%.o: ../source2/%.cpp +source2/%.o: ../source2/%.cpp source2/subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.cpp' g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/subdir.mk index d98430eacf9..6f21557da49 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.cpp +%.o: ../%.cpp subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.cpp' g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/makefile index 80762d820f5..1b306d846ed 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/makefile @@ -31,6 +31,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := preAndPostBuildSteps BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -47,7 +53,7 @@ all: main-build: preAndPostBuildSteps # Tool invocations -preAndPostBuildSteps: $(OBJS) $(USER_OBJS) +preAndPostBuildSteps: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.linker.gnu.cpp' g++ -o "preAndPostBuildSteps" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/subdir.mk index f904abd99d5..21fbf3cff42 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ CXX_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.cxx +%.o: ../%.cxx subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.cpp' g++ -O0 -g3 -Wall -c -fmessage-length=0 -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/makefile index eba1a2b88cc..4434b867dcd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := rcbsBasicTest BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: rcbsBasicTest # Tool invocations -rcbsBasicTest: $(OBJS) $(USER_OBJS) +rcbsBasicTest: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.linker.gnu.c' gcc -o "rcbsBasicTest" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/subdir.mk index e2052920d5f..0d246ace2fc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/subdir.mk @@ -11,7 +11,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -rcbsBasicTest.o: ../rcbsBasicTest.c +rcbsBasicTest.o: ../rcbsBasicTest.c subdir.mk @echo 'Building file: $<' @echo 'Now executing custom build step for rcbsBasicTest debug config' gcc -g -c ../rcbsBasicTest.c -o ./rcbsBasicTest.o diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/makefile index ddb1b1c0926..b92bd60c51b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := singleFileExe BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: singleFileExe # Tool invocations -singleFileExe: $(OBJS) $(USER_OBJS) +singleFileExe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.linker.gnu.c' gcc -o "singleFileExe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/subdir.mk index f0e192379ca..aeabac9629b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/makefile index 8c26536ab64..0c089adaa3a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/makefile @@ -20,6 +20,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := testwithspaces BUILD_ARTIFACT_EXTENSION := a BUILD_ARTIFACT_PREFIX := lib @@ -31,7 +37,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_AR all: testwithspaces.exe # Tool invocations -testwithspaces.exe: $(OBJS) $(USER_OBJS) +testwithspaces.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' gcc -o "testwithspaces.exe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sub folder with spaces/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sub folder with spaces/subdir.mk index e4410d399fa..79476aeb671 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sub folder with spaces/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sub folder with spaces/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -sub\ folder\ with\ spaces/foo\ with\ spaces.o: ../sub\ folder\ with\ spaces/foo\ with\ spaces.c +sub\ folder\ with\ spaces/foo\ with\ spaces.o: ../sub\ folder\ with\ spaces/foo\ with\ spaces.c sub\ folder\ with\ spaces/subdir.mk @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"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/subdir.mk index 9062b16d361..ab0bab196d8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -main\ with\ spaces.o: ../main\ with\ spaces.c +main\ with\ spaces.o: ../main\ with\ spaces.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"main with spaces.d" -MT"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/makefile index 5fa6a4487dc..3e906f6f2be 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := Test30_1 BUILD_ARTIFACT_EXTENSION := so.4.5.6 BUILD_ARTIFACT_PREFIX := @@ -36,7 +42,7 @@ test30_1.so.1.2.3 \ all: Test30_1.so.4.5.6 secondary-outputs # Tool invocations -Test30_1.so.4.5.6: $(EXECUTABLES) +Test30_1.so.4.5.6: $(EXECUTABLES) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Deploy tool' cp $(EXECUTABLES) "Test30_1.so.4.5.6" @@ -45,7 +51,7 @@ Test30_1.so.4.5.6: $(EXECUTABLES) default.so.4.5.6: Test30_1.so.4.5.6 $(EXECUTABLES) -test30_1.so.1.2.3: $(STRIPPEDOBJS) +test30_1.so.1.2.3: $(STRIPPEDOBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Invoking: MBS30.linker.gnu.c' gcc -shared -Wl,-soname=test30_1.so.1.2.3 -o "test30_1.so.1.2.3" $(STRIPPEDOBJS) @echo 'Finished building: $@' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/subdir.mk index 8b2681ca4ca..e54fe9bbd77 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/subdir.mk @@ -28,7 +28,7 @@ TEST30_1_GNU_SO_TAR_OUTPUTC_OUTPUTS += \ # Each subdirectory must supply rules for building sources it contributes -f1.c: ../test.tar +f1.c: ../test.tar subdir.mk @echo 'Building file: $<' @echo 'Invoking: Un-tar' tar -xf "$<" @@ -39,7 +39,7 @@ f2.c: f1.c test_ar.h: f1.c CDT.bmp: f1.c -%.oprestripped: ./%.c +%.oprestripped: ./%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O2 -g -Wall -c -fmessage-length=0 -v -o "$@" "$<" && \ @@ -48,14 +48,14 @@ CDT.bmp: f1.c @echo 'Finished building: $<' @echo ' ' -%.o: ./%.oprestripped +%.o: ./%.oprestripped subdir.mk @echo 'Building file: $<' @echo 'Invoking: Strip object file' strip --preserve-dates -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' -%.jpeg: ./%.bmp +%.jpeg: ./%.bmp subdir.mk @echo 'Building file: $<' @echo 'Invoking: Convert to jpeg' cjpeg -outfile "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/makefile index 9b3e997dc7b..c16a14ce395 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/makefile @@ -14,6 +14,12 @@ RM := rm -rf -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test30_2 BUILD_ARTIFACT_EXTENSION := tmp BUILD_ARTIFACT_PREFIX := @@ -31,20 +37,20 @@ new.log \ all: test30_2.tmp # Tool invocations -test30_2.tmp: $(LOGFILE) +test30_2.tmp: $(LOGFILE) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: cat' cat $(LOGFILE) @echo 'Finished building target: $@' @echo ' ' -new.tar: $(CPP_SRCS) $(ASM_SRCS) +new.tar: $(CPP_SRCS) $(ASM_SRCS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Invoking: tar-create' tar -cf new.tar $(CPP_SRCS) $(ASM_SRCS) @echo 'Finished building: $@' @echo ' ' -new.log: $(TAROUT) +new.log: $(TAROUT) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Invoking: tar-list' tar -tf $(TAROUT) > new.log @echo 'Finished building: $@' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/makefile index b25512dc62a..136bd35a97f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test BUILD_ARTIFACT_EXTENSION := exe BUILD_ARTIFACT_PREFIX := @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test.exe # Tool invocations -test.exe: $(OBJS) $(USER_OBJS) +test.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' gcc -o "test.exe" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/subdir.mk index d9eb1a157d0..13d2a96389f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/subdir.mk @@ -14,7 +14,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/makefile index 2af07b434d4..29509cebb15 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/makefile @@ -13,6 +13,12 @@ RM := rm -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := testMacroSupportInBuildDefinitions BUILD_ARTIFACT_EXTENSION := tar BUILD_ARTIFACT_PREFIX := @@ -24,7 +30,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: testMacroSupportInBuildDefinitions.tar # Tool invocations -testMacroSupportInBuildDefinitions.tar: $(BAR_FILES) +testMacroSupportInBuildDefinitions.tar: $(BAR_FILES) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Bar Tool' tar cvf $@ $(BAR_FILES) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/subdir.mk index ac8fa98ea5c..8a56482168a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/subdir.mk @@ -11,7 +11,7 @@ BAR_FILES += \ # Each subdirectory must supply rules for building sources it contributes -this_is_a_test_prefix_with_a_macro_for_the_project_name_between_here_testMacroSupportInBuildDefinitions_and_here%.bar: ../%.foo +this_is_a_test_prefix_with_a_macro_for_the_project_name_between_here_testMacroSupportInBuildDefinitions_and_here%.bar: ../%.foo subdir.mk @echo 'Building file: $<' @echo 'Invoking: Foo Tool' cp "$<" "$@" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/makefile index 3ef4e768133..16450d2e9e7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/makefile @@ -19,6 +19,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := twoFileSO BUILD_ARTIFACT_EXTENSION := SOS BUILD_ARTIFACT_PREFIX := lib @@ -30,7 +36,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: libtwoFileSO.SOS # Tool invocations -libtwoFileSO.SOS: $(OBJS) $(USER_OBJS) +libtwoFileSO.SOS: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: MBS30.linker.gnu.c' gcc -shared -o "libtwoFileSO.SOS" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/subdir.mk index 5662216c129..303889f656b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/subdir.mk @@ -17,7 +17,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -%.o: ../%.c +%.o: ../%.c subdir.mk @echo 'Building file: $<' @echo 'Invoking: MBS30.compiler.gnu.c' gcc -O0 -g3 -c -v -o "$@" "$<" && \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/d3/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/d3/subdir.mk index e07ec1507fc..efa8e0bf4f3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/d3/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/d3/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1/d2/d3/%.o: ../d1/d2/d3/%.cpp +d1/d2/d3/%.o: ../d1/d2/d3/%.cpp d1/d2/d3/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/subdir.mk index f280815eb3c..9371f8fbeca 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/subdir.mk @@ -17,14 +17,14 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1/d2/e.o: ../d1/d2/e.cpp +d1/d2/e.o: ../d1/d2/e.cpp d1/d2/subdir.mk @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"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' -d1/d2/%.o: ../d1/d2/%.cpp +d1/d2/%.o: ../d1/d2/%.cpp d1/d2/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/subdir.mk index 0af13c08b41..5d6f88c00f0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/subdir.mk @@ -20,7 +20,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1/%.o: ../d1/%.cpp +d1/%.o: ../d1/%.cpp d1/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/d2_1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/d2_1/subdir.mk index f78f51c0c1b..cde8c609991 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/d2_1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/d2_1/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp +d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp d1_1/d2_1/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/subdir.mk index 97f5c59f092..c674d4bee1b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1_1/%.o: ../d1_1/%.cpp +d1_1/%.o: ../d1_1/%.cpp d1_1/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/asd/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/asd/subdir.mk index 3cd115af4de..493f2e4f0cf 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/asd/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/asd/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp +dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp dir1/dd/excluded_c/asd/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/subdir.mk index ebe1db6a72a..3c5203d8fed 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp +dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp dir1/dd/excluded_c/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/ff/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/ff/subdir.mk index 9083c76ae10..625c5fb6e32 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/ff/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/ff/subdir.mk @@ -21,14 +21,14 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -dir1/dd/ff/%.o: ../dir1/dd/ff/%.c +dir1/dd/ff/%.o: ../dir1/dd/ff/%.c dir1/dd/ff/subdir.mk @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 "$@" "$<" @echo 'Finished building: $<' @echo ' ' -dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp +dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp dir1/dd/ff/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile index 68ce6f74246..7a5106f90d6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/makefile @@ -42,6 +42,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test_40 BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -53,7 +59,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test_40 # Tool invocations -test_40: $(OBJS) $(USER_OBJS) +test_40: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Test 4.0 ToolName.linker.gnu.cpp' g++ -Llib/path/1 -o "test_40" $(OBJS) $(USER_OBJS) $(LIBS) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk index e07ec1507fc..efa8e0bf4f3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1/d2/d3/%.o: ../d1/d2/d3/%.cpp +d1/d2/d3/%.o: ../d1/d2/d3/%.cpp d1/d2/d3/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk index efe7e85c531..cb414a6c007 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk @@ -17,14 +17,14 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1/d2/e.o: ../d1/d2/e.cpp +d1/d2/e.o: ../d1/d2/e.cpp d1/d2/subdir.mk @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"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' -d1/d2/%.o: ../d1/d2/%.cpp +d1/d2/%.o: ../d1/d2/%.cpp d1/d2/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk index 3598fa9d12b..490f16300b1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk @@ -20,7 +20,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1/%.o: ../d1/%.cpp +d1/%.o: ../d1/%.cpp d1/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk index 85663bf6421..0d212c0cbaa 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp +d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp d1_1/d2_1/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk index dc0c3872c03..ea8e1261f7a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -d1_1/%.o: ../d1_1/%.cpp +d1_1/%.o: ../d1_1/%.cpp d1_1/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk index c285f5f7a40..e32ad1e6c38 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp +dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp dir1/dd/excluded_c/asd/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk index ea7e38ca1f2..c37ca261bc8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk @@ -14,7 +14,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp +dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp dir1/dd/excluded_c/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk index 28ccb78c40c..e7973ebac98 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk @@ -21,14 +21,14 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -dir1/dd/ff/%.o: ../dir1/dd/ff/%.c +dir1/dd/ff/%.o: ../dir1/dd/ff/%.c dir1/dd/ff/subdir.mk @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 "$@" "$<" @echo 'Finished building: $<' @echo ' ' -dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp +dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp dir1/dd/ff/subdir.mk @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 "$@" "$<" diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile index b669ad1a5ec..bd2b8726aa8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile @@ -42,6 +42,12 @@ endif -include ../makefile.defs +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + BUILD_ARTIFACT_NAME := test_40 BUILD_ARTIFACT_EXTENSION := BUILD_ARTIFACT_PREFIX := @@ -53,7 +59,7 @@ BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ART all: test_40 # Tool invocations -test_40: $(OBJS) $(USER_OBJS) +test_40: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' @echo 'Invoking: Test 4.0 ToolName.linker.gnu.cpp' g++ -Llib/path/2 -o "test_40" $(OBJS) $(USER_OBJS) $(LIBS) 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 77c646079e9..deeb346b52f 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 @@ -823,10 +823,19 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { bytes = buffer.toString().getBytes(); } - ByteArrayInputStream stream = new ByteArrayInputStream(bytes); - // use a platform operation to update the resource contents - boolean force = true; - file.setContents(stream, force, false, null); // Don't record history + byte[] oldBytes = null; + try (InputStream is = file.getContents(true)) { + oldBytes = is.readAllBytes(); + } catch (IOException e) { + } + + // Only write file if content differs + if (!Arrays.equals(oldBytes, bytes)) { + ByteArrayInputStream stream = new ByteArrayInputStream(bytes); + // use a platform operation to update the resource contents + boolean force = true; + file.setContents(stream, force, false, null); // Don't record history + } } /* (non-Javadoc) @@ -1263,6 +1272,13 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { // Include makefile.defs supplemental makefile buffer.append("-include ").append(reachProjectRoot()).append(SEPARATOR).append(MAKEFILE_DEFS).append(NEWLINE); //$NON-NLS-1$ + final String wildcardFileFmt = "$(wildcard %s)" + WHITESPACE + LINEBREAK; //$NON-NLS-1$ + buffer.append(NEWLINE).append("OPTIONAL_TOOL_DEPS :=").append(WHITESPACE).append(LINEBREAK); //$NON-NLS-1$ + buffer.append(String.format(wildcardFileFmt, reachProjectRoot() + SEPARATOR + MAKEFILE_DEFS)); + buffer.append(String.format(wildcardFileFmt, reachProjectRoot() + SEPARATOR + MAKEFILE_INIT)); + buffer.append(String.format(wildcardFileFmt, reachProjectRoot() + SEPARATOR + MAKEFILE_TARGETS)); + buffer.append(NEWLINE); + String ext = config.getArtifactExtension(); // try to resolve the build macros in the artifact extension try { @@ -1711,6 +1727,9 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { calculatedDependencies += input; } buildRule += calculatedDependencies; + buildRule += WHITESPACE + MAKEFILE_NAME; // makefile itself + buildRule += WHITESPACE + OBJECTS_MAKFILE; // objects.mk + buildRule += WHITESPACE + "$(OPTIONAL_TOOL_DEPS)"; //$NON-NLS-1$ // Optional dep to generated makefile extension files // We can't have duplicates in a makefile if (getRuleList().contains(buildRule)) { @@ -2593,7 +2612,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { patternBuildRuleDependencies += WHITESPACE + suitablePath; } - buildRule += COLON + WHITESPACE + (patternRule ? patternBuildRuleDependencies : buildRuleDependencies); + buildRule += COLON + WHITESPACE + (patternRule ? patternBuildRuleDependencies : buildRuleDependencies) + + WHITESPACE + escapeWhitespaces(relativePath + MODFILE_NAME); // No duplicates in a makefile. If we already have this rule, don't add it or the commands to build the file if (getRuleList().contains(buildRule)) { @@ -2865,7 +2885,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { depLine += escapeWhitespaces((depFiles[i]).toString()); } } - depLine += COLON + WHITESPACE + (patternRule ? patternBuildRuleDependencies : buildRuleDependencies); + depLine += COLON + WHITESPACE + (patternRule ? patternBuildRuleDependencies : buildRuleDependencies) + + WHITESPACE + escapeWhitespaces(relativePath + MODFILE_NAME); if (!getDepRuleList().contains(depLine)) { getDepRuleList().add(depLine); addedDepLines = true; |