diff options
| author | Christian Walther | 2021-08-24 10:31:30 +0000 |
|---|---|---|
| committer | Christian Walther | 2021-11-02 09:47:17 +0000 |
| commit | 3afae27158ad39cf795e25752fdcaf2fedfcdc91 (patch) | |
| tree | 2975ac5ea87b21a4db357bf2aae4cc721af528e2 | |
| parent | 32a6ad1f4d444218050b3b6b5a841641125fd170 (diff) | |
| download | org.eclipse.cdt-3afae27158ad39cf795e25752fdcaf2fedfcdc91.tar.gz org.eclipse.cdt-3afae27158ad39cf795e25752fdcaf2fedfcdc91.tar.xz org.eclipse.cdt-3afae27158ad39cf795e25752fdcaf2fedfcdc91.zip | |
Bug 575702: Nondeterministic makefile ordering
Several parts of makefile output were generated by iterating over
HashMaps, which do not have a deterministic iteration order. Use
TreeMaps instead to output in sorted order. This is possible now that
the API function with return type HashMap is no longer public API and
can be changed to return Map instead.
Benchmark files for affected tests are updated to the new ordering.
This would not be strictly necessary: the tests would also succeed
without, since org.eclipse.cdt.managedbuilder.testplugin.
ManagedBuildTestHelper.compareMakefiles() uses a reordering-tolerant
comparison. However, recording the new (now hopefully stable) order
makes future development on makefile generation easier by avoiding
spurious diff output when tests fail due to changes to other parts of
makefiles.
Change-Id: I20f2e51bd5b9e3bcc5da245d781ca5b4a34fc0b2
Signed-off-by: Christian Walther <walther@indel.ch>
102 files changed, 413 insertions, 410 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 a3988b9708e..d36ac1efc40 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../Sources/sub\ sources/func\ 3.c -OBJS += \ -./Sources/sub\ sources/func\ 3.o - C_DEPS += \ ./Sources/sub\ sources/func\ 3.d +OBJS += \ +./Sources/sub\ sources/func\ 3.o + # 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/subdir.mk 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 9441164967c..0786e760ef4 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 @@ -8,16 +8,16 @@ C_SRCS += \ ../Sources/func2.c \ ../Sources/func4.c -OBJS += \ -./Sources/func1.o \ -./Sources/func2.o \ -./Sources/func4.o - C_DEPS += \ ./Sources/func1.d \ ./Sources/func2.d \ ./Sources/func4.d +OBJS += \ +./Sources/func1.o \ +./Sources/func2.o \ +./Sources/func4.o + # Each subdirectory must supply rules for building sources it contributes Sources/%.o: ../Sources/%.c Sources/subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk index 52a3d69926a..673630dd080 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk @@ -2,14 +2,14 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +ASM_SRCS := C_SRCS := -S_UPPER_SRCS := OBJ_SRCS := -ASM_SRCS := -OBJS := +O_SRCS := +S_UPPER_SRCS := C_DEPS := EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 91318a6508d..b89b710c322 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../main.c -OBJS += \ -./main.o - C_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk 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 acd15ec8be3..070abcca1f5 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../Sources/sub\ sources/func\ 3.c -OBJS += \ -./Sources/sub\ sources/func\ 3.o - C_DEPS += \ ./Sources/sub\ sources/func\ 3.d +OBJS += \ +./Sources/sub\ sources/func\ 3.o + # 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/subdir.mk 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 e89b6a64964..c9a57cf3b44 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 @@ -8,16 +8,16 @@ C_SRCS += \ ../Sources/func2.c \ ../Sources/func4.c -OBJS += \ -./Sources/func1.o \ -./Sources/func2.o \ -./Sources/func4.o - C_DEPS += \ ./Sources/func1.d \ ./Sources/func2.d \ ./Sources/func4.d +OBJS += \ +./Sources/func1.o \ +./Sources/func2.o \ +./Sources/func4.o + # Each subdirectory must supply rules for building sources it contributes Sources/%.o: ../Sources/%.c Sources/subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk index 52a3d69926a..673630dd080 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk @@ -2,14 +2,14 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +ASM_SRCS := C_SRCS := -S_UPPER_SRCS := OBJ_SRCS := -ASM_SRCS := -OBJS := +O_SRCS := +S_UPPER_SRCS := C_DEPS := EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 072df100258..0010805ba99 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../main.c -OBJS += \ -./main.o - C_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk 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 0f870d0598d..b0c93542516 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../Sources/sub\ sources/func\ 3.c -OBJS += \ -./Sources/sub\ sources/func\ 3.o - C_DEPS += \ ./Sources/sub\ sources/func\ 3.d +OBJS += \ +./Sources/sub\ sources/func\ 3.o + # 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/subdir.mk 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 c2c9bb8dba5..5a91030ea42 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 @@ -8,16 +8,16 @@ C_SRCS += \ ../Sources/func2.c \ ../Sources/func4.c -OBJS += \ -./Sources/func1.o \ -./Sources/func2.o \ -./Sources/func4.o - C_DEPS += \ ./Sources/func1.d \ ./Sources/func2.d \ ./Sources/func4.d +OBJS += \ +./Sources/func1.o \ +./Sources/func2.o \ +./Sources/func4.o + # Each subdirectory must supply rules for building sources it contributes Sources/%.o: ../Sources/%.c Sources/subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk index 52a3d69926a..673630dd080 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk @@ -2,14 +2,14 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +ASM_SRCS := C_SRCS := -S_UPPER_SRCS := OBJ_SRCS := -ASM_SRCS := -OBJS := +O_SRCS := +S_UPPER_SRCS := C_DEPS := EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 54f505074b4..4e286186ccd 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../main.c -OBJS += \ -./main.o - C_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes main.o: ../main.c subdir.mk 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 ffae1d2b509..455f0590dc4 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 @@ -15,9 +15,6 @@ ifneq ($(MAKECMDGOALS),clean) ifneq ($(strip $(C++_DEPS)),) -include $(C++_DEPS) endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif @@ -27,6 +24,9 @@ endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/sources.mk index c1514fd5b49..c15c16c0447 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/sources.mk @@ -2,24 +2,24 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := -CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := -S_UPPER_SRCS := -OBJ_SRCS := ASM_SRCS := -CXX_SRCS := C++_SRCS := CC_SRCS := +CPP_SRCS := +CXX_SRCS := +C_SRCS := +C_UPPER_SRCS := +OBJ_SRCS := +O_SRCS := +S_UPPER_SRCS := C++_DEPS := -OBJS := -C_DEPS := CC_DEPS := CPP_DEPS := -EXECUTABLES := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 0edcb547cb9..1b71e62830e 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../test.cpp -OBJS += \ -./test.o - CPP_DEPS += \ ./test.d +OBJS += \ +./test.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.cpp subdir.mk 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 a01609097bf..7b951a24a2a 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 @@ -18,15 +18,15 @@ endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CPP_DEPS)),) -include $(CPP_DEPS) endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif @@ -56,7 +56,7 @@ main-build: test20.exe # Tool invocations test20.exe: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) @echo 'Building target: $@' - @echo 'Invoking: GCC C++ Linker' + @echo 'Invoking: Cygwin C++ Linker' g++ -o "test20.exe" $(OBJS) $(USER_OBJS) $(LIBS) @echo 'Finished building target: $@' @echo ' ' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/objects.mk index b19ccc5913d..742c2da043f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/objects.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/objects.mk @@ -2,7 +2,7 @@ # Automatically-generated file. Do not edit! ################################################################################ -LIBS := - USER_OBJS := +LIBS := + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/sources.mk index c1514fd5b49..c15c16c0447 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/sources.mk @@ -2,24 +2,24 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := -CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := -S_UPPER_SRCS := -OBJ_SRCS := ASM_SRCS := -CXX_SRCS := C++_SRCS := CC_SRCS := +CPP_SRCS := +CXX_SRCS := +C_SRCS := +C_UPPER_SRCS := +OBJ_SRCS := +O_SRCS := +S_UPPER_SRCS := C++_DEPS := -OBJS := -C_DEPS := CC_DEPS := CPP_DEPS := -EXECUTABLES := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 eb1bee07ca3..be29dcd74c4 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 @@ -6,17 +6,17 @@ CPP_SRCS += \ ../Test1.cpp -OBJS += \ -./Test1.o - CPP_DEPS += \ ./Test1.d +OBJS += \ +./Test1.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.cpp subdir.mk @echo 'Building file: $<' - @echo 'Invoking: GCC C++ Compiler' + @echo 'Invoking: Cygwin C++ Compiler' g++ -O2 -g1 -pedantic -pedantic-errors -Wall -Werror -c -fmessage-length=0 -v -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' 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 a2d593bbcb0..74cdf3d739b 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../Functions/Func1.c -OBJS += \ -./Functions/Func1.o - C_DEPS += \ ./Functions/Func1.d +OBJS += \ +./Functions/Func1.o + # Each subdirectory must supply rules for building sources it contributes Functions/%.o: ../Functions/%.c Functions/subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk index fa1bbce179d..2daead33667 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk @@ -2,14 +2,14 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +ASM_SRCS := C_SRCS := -S_UPPER_SRCS := OBJ_SRCS := -ASM_SRCS := -OBJS := +O_SRCS := +S_UPPER_SRCS := C_DEPS := EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 89280757eb1..9e39072d4e8 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../main.c -OBJS += \ -./main.o - C_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk 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 5125c0d4442..ac441926eb3 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../Functions/Func1.cpp -OBJS += \ -./Functions/Func1.o - CPP_DEPS += \ ./Functions/Func1.d +OBJS += \ +./Functions/Func1.o + # Each subdirectory must supply rules for building sources it contributes Functions/%.o: ../Functions/%.cpp Functions/subdir.mk 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 5797fd661e1..e84c3ff0165 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 @@ -16,9 +16,6 @@ ifneq ($(MAKECMDGOALS),clean) ifneq ($(strip $(C++_DEPS)),) -include $(C++_DEPS) endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif @@ -28,6 +25,9 @@ endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk index 1881eb751a7..dbbe731afad 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk @@ -2,24 +2,24 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := -CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := -S_UPPER_SRCS := -OBJ_SRCS := ASM_SRCS := -CXX_SRCS := C++_SRCS := CC_SRCS := -OBJS := +CPP_SRCS := +CXX_SRCS := +C_SRCS := +C_UPPER_SRCS := +OBJ_SRCS := +O_SRCS := +S_UPPER_SRCS := C++_DEPS := -C_DEPS := CC_DEPS := CPP_DEPS := -EXECUTABLES := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 d97cd305d31..1e71ee90931 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../main.c -OBJS += \ -./main.o - C_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/objects.mk index b19ccc5913d..742c2da043f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/objects.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/objects.mk @@ -2,7 +2,7 @@ # Automatically-generated file. Do not edit! ################################################################################ -LIBS := - USER_OBJS := +LIBS := + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk index 2d6bdf5df20..b9165764518 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk @@ -2,12 +2,12 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := C_SRCS := -S_UPPER_SRCS := +O_SRCS := S_SRCS := -OBJS := +S_UPPER_SRCS := C_DEPS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 549af82ef90..e2208b718ad 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 @@ -7,14 +7,14 @@ C_SRCS += \ ../f1.c \ ../f2.c -OBJS += \ -./f1.o \ -./f2.o - C_DEPS += \ ./f1.d \ ./f2.d +OBJS += \ +./f1.o \ +./f2.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk index b19ccc5913d..742c2da043f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk @@ -2,7 +2,7 @@ # Automatically-generated file. Do not edit! ################################################################################ -LIBS := - USER_OBJS := +LIBS := + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk index a7659979874..b9165764518 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk @@ -3,11 +3,11 @@ ################################################################################ C_SRCS := -S_UPPER_SRCS := O_SRCS := S_SRCS := -OBJS := +S_UPPER_SRCS := C_DEPS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 c788181fe83..c39f7b21c33 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 @@ -15,9 +15,6 @@ RM := rm -rf -include objects.mk ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif @@ -27,6 +24,9 @@ endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif 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 4e361444ef9..30d32f56b98 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../source1/Class1.cpp -OBJS += \ -./source1/Class1.o - CPP_DEPS += \ ./source1/Class1.d +OBJS += \ +./source1/Class1.o + # Each subdirectory must supply rules for building sources it contributes source1/%.o: ../source1/%.cpp source1/subdir.mk 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 c51d3c228d8..430a3131c58 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../source2/source21/Class21.cpp -OBJS += \ -./source2/source21/Class21.o - CPP_DEPS += \ ./source2/source21/Class21.d +OBJS += \ +./source2/source21/Class21.o + # Each subdirectory must supply rules for building sources it contributes source2/source21/Class21.o: ../source2/source21/Class21.cpp source2/source21/subdir.mk 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 586bdcbd8b7..81937df1541 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../source2/Class2.cpp -OBJS += \ -./source2/Class2.o - CPP_DEPS += \ ./source2/Class2.d +OBJS += \ +./source2/Class2.o + # Each subdirectory must supply rules for building sources it contributes source2/%.o: ../source2/%.cpp source2/subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk index 9adc934fc62..047eb222b70 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk @@ -2,20 +2,20 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +CC_SRCS := CPP_SRCS := -C_UPPER_SRCS := +CXX_SRCS := C_SRCS := -S_UPPER_SRCS := +C_UPPER_SRCS := +O_SRCS := S_SRCS := -CXX_SRCS := -CC_SRCS := -OBJS := -C_DEPS := +S_UPPER_SRCS := CC_DEPS := CPP_DEPS := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 53157d303b3..06b849c326e 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../main.cpp -OBJS += \ -./main.o - CPP_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.cpp subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/sources.mk index 2d6bdf5df20..b9165764518 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/sources.mk @@ -2,12 +2,12 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := C_SRCS := -S_UPPER_SRCS := +O_SRCS := S_SRCS := -OBJS := +S_UPPER_SRCS := C_DEPS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 312ba3b2833..4dcc61195ba 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../main.c -OBJS += \ -./main.o - C_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk 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 c9fe7fd3d22..f6c2c7bcea3 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 @@ -12,9 +12,6 @@ RM := rm -rf -include objects.mk ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif @@ -24,6 +21,9 @@ endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/sources.mk index 71808421af0..59afb7f9948 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/sources.mk @@ -2,20 +2,20 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +CC_SRCS := CPP_SRCS := -C_UPPER_SRCS := +CXX_SRCS := C_SRCS := -S_UPPER_SRCS := +C_UPPER_SRCS := +O_SRCS := S_SRCS := -CXX_SRCS := -CC_SRCS := -OBJS := -C_DEPS := +S_UPPER_SRCS := CC_DEPS := CPP_DEPS := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 b08adb3d448..8d11a6a5406 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 @@ -7,14 +7,14 @@ C_SRCS += \ ../so1.c \ ../so2.c -OBJS += \ -./so1.o \ -./so2.o - C_DEPS += \ ./so1.d \ ./so2.d +OBJS += \ +./so1.o \ +./so2.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/sources.mk index 6536c4d22b4..f69508fcaae 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/Benchmarks/sources.mk @@ -2,17 +2,17 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +F90_SRCS := F90_UPPER_SRCS := -F_UPPER_SRCS := +FOR_SRCS := +FOR_UPPER_SRCS := F_SRCS := +F_UPPER_SRCS := OBJ_SRCS := -FOR_UPPER_SRCS := -FOR_SRCS := -F90_SRCS := -OBJS := -MODS := +O_SRCS := EXECUTABLES := +MODS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk index e1d7d578abe..78300c360d4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk @@ -2,17 +2,17 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +F90_SRCS := F90_UPPER_SRCS := -F_UPPER_SRCS := +FOR_SRCS := +FOR_UPPER_SRCS := F_SRCS := +F_UPPER_SRCS := OBJ_SRCS := -FOR_UPPER_SRCS := -FOR_SRCS := -F90_SRCS := -OBJS := -MODS := +O_SRCS := EXECUTABLES := +MODS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/sources.mk index 07f0261a56e..a969660f720 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/Benchmarks/sources.mk @@ -2,13 +2,13 @@ # Automatically-generated file. Do not edit! ################################################################################ +COP_SRCS := CPP_SRCS := -C_UPPER_SRCS := +CPP_UPPER_SRCS := C_SRCS := +C_UPPER_SRCS := OBJ_SRCS := OPT_SRCS := -COP_SRCS := -CPP_UPPER_SRCS := ASSIGNTOOPTION_EXECUTABLE_OUTPUTS := 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 439f2903da3..69e5f34b411 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 @@ -3,6 +3,9 @@ ################################################################################ # Add inputs and outputs from these tool invocations to the build variables +COP_SRCS += \ +../TestATO.cop + C_SRCS += \ ../TestATO.c @@ -10,9 +13,6 @@ OPT_SRCS += \ ../TestATO1.opt \ ../TestATO2.opt -COP_SRCS += \ -../TestATO.cop - OBJS += \ ./TestATO.obj 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 09155843388..d40fcd632ef 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 @@ -6,14 +6,14 @@ X_SRCS += \ ../Functions/Func1.x -OBJS += \ -./Functions/Func1.o +CS += \ +./Functions/Func1.c C_DEPS += \ ./Functions/Func1.d -CS += \ -./Functions/Func1.c +OBJS += \ +./Functions/Func1.o # Each subdirectory must supply rules for building sources it contributes diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk index b20de370c83..3c25b17520b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk @@ -2,15 +2,15 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := -FOO_SRCS := C_SRCS := +FOO_SRCS := +O_SRCS := X_SRCS := -OBJS := -FINAL := -C_DEPS := CS := +C_DEPS := EXECUTABLES := +FINAL := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 33c19700066..d35b314e4a3 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 @@ -6,14 +6,14 @@ X_SRCS += \ ../main.x -OBJS += \ -./main.o +CS += \ +./main.c C_DEPS += \ ./main.d -CS += \ -./main.c +OBJS += \ +./main.o # Each subdirectory must supply rules for building sources it contributes 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 3f020d43f6c..42f351ebd07 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 @@ -12,9 +12,6 @@ RM := rm -rf -include objects.mk ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif @@ -24,6 +21,9 @@ endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/sources.mk index 253f5085594..20810b9d039 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/Benchmarks/sources.mk @@ -2,19 +2,19 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +CC_SRCS := CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := CXX_SRCS := -CC_SRCS := -OBJS := -C_DEPS := +C_SRCS := +C_UPPER_SRCS := +O_SRCS := CC_DEPS := CPP_DEPS := -EXECUTABLES := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 9be8abf0b96..477292767e8 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 @@ -6,12 +6,12 @@ CXX_SRCS += \ ../main.cxx -OBJS += \ -./main.o - CXX_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.cxx subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/objects.mk index b19ccc5913d..742c2da043f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/objects.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/objects.mk @@ -2,7 +2,7 @@ # Automatically-generated file. Do not edit! ################################################################################ -LIBS := - USER_OBJS := +LIBS := + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/sources.mk index 99517232316..2da1fe64bf9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/Benchmarks/sources.mk @@ -2,11 +2,11 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := C_SRCS := -OBJS := -C_DEPS := +O_SRCS := ARCHIVES := +C_DEPS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 522ff665b53..bafd716118d 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 @@ -7,14 +7,14 @@ C_SRCS += \ ../f1.c \ ../f2.c -OBJS += \ -./f1.o \ -./f2.o - C_DEPS += \ ./f1.d \ ./f2.d +OBJS += \ +./f1.o \ +./f2.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/objects.mk index b19ccc5913d..742c2da043f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/objects.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/objects.mk @@ -2,7 +2,7 @@ # Automatically-generated file. Do not edit! ################################################################################ -LIBS := - USER_OBJS := +LIBS := + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/sources.mk index ca18ed70ecc..2da1fe64bf9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/Benchmarks/sources.mk @@ -4,9 +4,9 @@ C_SRCS := O_SRCS := -OBJS := ARCHIVES := C_DEPS := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 174d67e20e7..e6a2b061589 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 @@ -15,9 +15,6 @@ RM := rm -rf -include objects.mk ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif @@ -27,6 +24,9 @@ endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif 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 f26a6a5297d..5f8ecc3f05a 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../source1/Class1.cpp -OBJS += \ -./source1/Class1.o - CPP_DEPS += \ ./source1/Class1.d +OBJS += \ +./source1/Class1.o + # Each subdirectory must supply rules for building sources it contributes source1/%.o: ../source1/%.cpp source1/subdir.mk 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 a2fa6abd8bc..a10b4863339 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../source2/source21/Class21.cpp -OBJS += \ -./source2/source21/Class21.o - CPP_DEPS += \ ./source2/source21/Class21.d +OBJS += \ +./source2/source21/Class21.o + # Each subdirectory must supply rules for building sources it contributes source2/source21/Class21.o: ../source2/source21/Class21.cpp source2/source21/subdir.mk 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 098e9f40b75..56b081103b1 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../source2/Class2.cpp -OBJS += \ -./source2/Class2.o - CPP_DEPS += \ ./source2/Class2.d +OBJS += \ +./source2/Class2.o + # Each subdirectory must supply rules for building sources it contributes source2/%.o: ../source2/%.cpp source2/subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk index 4092a172734..a502fb13e32 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk @@ -2,19 +2,19 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +CC_SRCS := CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := CXX_SRCS := -CC_SRCS := -OBJS := -C_DEPS := +C_SRCS := +C_UPPER_SRCS := +O_SRCS := CC_DEPS := CPP_DEPS := -EXECUTABLES := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 84c69d47ba3..4c4695e2e74 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../main.cpp -OBJS += \ -./main.o - CPP_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.cpp subdir.mk 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 708b72b927b..fb253a937b3 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 @@ -12,9 +12,6 @@ RM := rm -rf -include objects.mk ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif @@ -24,6 +21,9 @@ endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/sources.mk index 253f5085594..20810b9d039 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/Benchmarks/sources.mk @@ -2,19 +2,19 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +CC_SRCS := CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := CXX_SRCS := -CC_SRCS := -OBJS := -C_DEPS := +C_SRCS := +C_UPPER_SRCS := +O_SRCS := CC_DEPS := CPP_DEPS := -EXECUTABLES := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 9be8abf0b96..477292767e8 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 @@ -6,12 +6,12 @@ CXX_SRCS += \ ../main.cxx -OBJS += \ -./main.o - CXX_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.cxx subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/sources.mk index 21967bbf479..1aff72a2810 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/Benchmarks/sources.mk @@ -2,11 +2,11 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := C_SRCS := -OBJS := +O_SRCS := C_DEPS := EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/sources.mk index 21967bbf479..1aff72a2810 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/Benchmarks/sources.mk @@ -2,11 +2,11 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := C_SRCS := -OBJS := +O_SRCS := C_DEPS := EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 8de478ddc38..efffe174739 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../main.c -OBJS += \ -./main.o - C_DEPS += \ ./main.d +OBJS += \ +./main.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/sources.mk index 363df6ba22a..f23b966b352 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/Benchmarks/sources.mk @@ -2,23 +2,23 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := -FOO_SRCS := +BMP_SRCS := C_SRCS := +FOO_SRCS := OPRESTRIPPED_SRCS := +O_SRCS := SO.1.2.3_SRCS := -BMP_SRCS := TAR_SRCS := -STRIPPEDOBJS := -OBJS := +C_DEPS := +EXECUTABLES := FINAL := +OBJS := +STRIPPEDOBJS := TEST30_1_GNU_SO_CJPEG_OUTPUT_OUTPUTS := -C_DEPS := TEST30_1_GNU_SO_DEPLOY_OUTPUT_OUTPUTS := -TEST30_1_GNU_SO_TAR_OUTPUTH_OUTPUTS := TEST30_1_GNU_SO_TAR_OUTPUTBMP_OUTPUTS := -EXECUTABLES := TEST30_1_GNU_SO_TAR_OUTPUTC_OUTPUTS := +TEST30_1_GNU_SO_TAR_OUTPUTH_OUTPUTS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 4becadde446..f5b6ce1c4a5 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 @@ -6,21 +6,21 @@ TAR_SRCS += \ ../test.tar -STRIPPEDOBJS += \ -./f1.o \ -./f2.o +C_DEPS += \ +./f1.d \ +./f2.d OBJS += \ ./f1.oprestripped \ ./f2.oprestripped +STRIPPEDOBJS += \ +./f1.o \ +./f2.o + TEST30_1_GNU_SO_CJPEG_OUTPUT_OUTPUTS += \ ./CDT.jpeg -C_DEPS += \ -./f1.d \ -./f2.d - TEST30_1_GNU_SO_TAR_OUTPUTC_OUTPUTS += \ ./f1.c \ ./f2.c \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk index 4d78f48237e..16fbadf46ce 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk @@ -2,18 +2,18 @@ # Automatically-generated file. Do not edit! ################################################################################ +ASM_SRCS := +C++_SRCS := +CC_SRCS := CPP_SRCS := +CXX_SRCS := C_UPPER_SRCS := -S_UPPER_SRCS := -ASM_SRCS := LOG_SRCS := +S_UPPER_SRCS := TAR_SRCS := -CXX_SRCS := -C++_SRCS := -CC_SRCS := +LOGFILE := TAROUT := TERMINAL__DUMMY_OUTPUT__OUTPUTS := -LOGFILE := TOUCHEDFILES := # Every subdirectory with source files must be described here diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/subdir.mk index f0088fffdc6..8db86e5f468 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/subdir.mk @@ -3,13 +3,13 @@ ################################################################################ # Add inputs and outputs from these tool invocations to the build variables +ASM_SRCS += \ +../a1.asm + CPP_SRCS += \ ../f1.cpp \ ../f2.cpp -ASM_SRCS += \ -../a1.asm - # Each subdirectory must supply rules for building sources it contributes diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/sources.mk index df1db101101..407d90a33a6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/Benchmarks/sources.mk @@ -2,14 +2,14 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := +ASM_SRCS := C_SRCS := -S_UPPER_SRCS := OBJ_SRCS := -ASM_SRCS := -OBJS := +O_SRCS := +S_UPPER_SRCS := C_DEPS := EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 64476a287e5..cfbed2916e1 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 @@ -6,12 +6,12 @@ C_SRCS += \ ../test.c -OBJS += \ -./test.o - C_DEPS += \ ./test.d +OBJS += \ +./test.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/sources.mk index 4f7408196b6..2b23bd4809a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/Benchmarks/sources.mk @@ -2,10 +2,10 @@ # Automatically-generated file. Do not edit! ################################################################################ -FOO_SRCS := BAR_SRCS := -TAR_FILE_OUTPUTS := +FOO_SRCS := BAR_FILES := +TAR_FILE_OUTPUTS := # Every subdirectory with source files must be described here SUBDIRS := \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/sources.mk index 6b64b2f411b..1ab95a436a3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/Benchmarks/sources.mk @@ -2,11 +2,11 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := C_SRCS := -OBJS := +O_SRCS := C_DEPS := LIBRARIES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 e751319a830..d962e1f9af1 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 @@ -7,14 +7,14 @@ C_SRCS += \ ../so1.c \ ../so2.c -OBJS += \ -./so1.o \ -./so2.o - C_DEPS += \ ./so1.d \ ./so2.d +OBJS += \ +./so1.o \ +./so2.o + # Each subdirectory must supply rules for building sources it contributes %.o: ../%.c subdir.mk 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 97e45a14263..30efe94aa1e 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1/d2/d3/t.cpp \ ../d1/d2/d3/y.cpp -OBJS += \ -./d1/d2/d3/t.o \ -./d1/d2/d3/y.o - CPP_DEPS += \ ./d1/d2/d3/t.d \ ./d1/d2/d3/y.d +OBJS += \ +./d1/d2/d3/t.o \ +./d1/d2/d3/y.o + # Each subdirectory must supply rules for building sources it contributes d1/d2/d3/%.o: ../d1/d2/d3/%.cpp d1/d2/d3/subdir.mk 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 898f6fb8b15..e7d59b030fa 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1/d2/e.cpp \ ../d1/d2/r.cpp -OBJS += \ -./d1/d2/e.o \ -./d1/d2/r.o - CPP_DEPS += \ ./d1/d2/e.d \ ./d1/d2/r.d +OBJS += \ +./d1/d2/e.o \ +./d1/d2/r.o + # Each subdirectory must supply rules for building sources it contributes d1/d2/e.o: ../d1/d2/e.cpp d1/d2/subdir.mk 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 e5a8615a153..a0ac72b31f9 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 @@ -8,16 +8,16 @@ CPP_SRCS += \ ../d1/u.cpp \ ../d1/w.cpp -OBJS += \ -./d1/q.o \ -./d1/u.o \ -./d1/w.o - CPP_DEPS += \ ./d1/q.d \ ./d1/u.d \ ./d1/w.d +OBJS += \ +./d1/q.o \ +./d1/u.o \ +./d1/w.o + # Each subdirectory must supply rules for building sources it contributes d1/%.o: ../d1/%.cpp d1/subdir.mk 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 2de6c841e28..177ca5e2564 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1_1/d2_1/a.cpp \ ../d1_1/d2_1/p.cpp -OBJS += \ -./d1_1/d2_1/a.o \ -./d1_1/d2_1/p.o - CPP_DEPS += \ ./d1_1/d2_1/a.d \ ./d1_1/d2_1/p.d +OBJS += \ +./d1_1/d2_1/a.o \ +./d1_1/d2_1/p.o + # Each subdirectory must supply rules for building sources it contributes d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp d1_1/d2_1/subdir.mk 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 dcf73f98d43..f28473322c3 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1_1/i.cpp \ ../d1_1/o.cpp -OBJS += \ -./d1_1/i.o \ -./d1_1/o.o - CPP_DEPS += \ ./d1_1/i.d \ ./d1_1/o.d +OBJS += \ +./d1_1/i.o \ +./d1_1/o.o + # Each subdirectory must supply rules for building sources it contributes d1_1/%.o: ../d1_1/%.cpp d1_1/subdir.mk 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 cdf7f04cc6c..5d3c5841a09 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../dir1/dd/excluded_c/asd/s.cpp -OBJS += \ -./dir1/dd/excluded_c/asd/s.o - CPP_DEPS += \ ./dir1/dd/excluded_c/asd/s.d +OBJS += \ +./dir1/dd/excluded_c/asd/s.o + # 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/subdir.mk 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 46e03c21dd8..f1156f63d0e 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../dir1/dd/excluded_c/inc.cpp -OBJS += \ -./dir1/dd/excluded_c/inc.o - CPP_DEPS += \ ./dir1/dd/excluded_c/inc.d +OBJS += \ +./dir1/dd/excluded_c/inc.o + # Each subdirectory must supply rules for building sources it contributes dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp dir1/dd/excluded_c/subdir.mk 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 ebe5dfd8f15..da9c1f47fdf 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 @@ -3,21 +3,21 @@ ################################################################################ # Add inputs and outputs from these tool invocations to the build variables -C_SRCS += \ -../dir1/dd/ff/vbn.c - CPP_SRCS += \ ../dir1/dd/ff/zxc.cpp -OBJS += \ -./dir1/dd/ff/vbn.o \ -./dir1/dd/ff/zxc.o +C_SRCS += \ +../dir1/dd/ff/vbn.c + +CPP_DEPS += \ +./dir1/dd/ff/zxc.d C_DEPS += \ ./dir1/dd/ff/vbn.d -CPP_DEPS += \ -./dir1/dd/ff/zxc.d +OBJS += \ +./dir1/dd/ff/vbn.o \ +./dir1/dd/ff/zxc.o # Each subdirectory must supply rules for building sources it contributes 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 6154d437d96..a63e18c0cf1 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 @@ -26,15 +26,15 @@ endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CPP_DEPS)),) -include $(CPP_DEPS) endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk index 5f594a8388a..e92e39761ba 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk @@ -2,7 +2,7 @@ # Automatically-generated file. Do not edit! ################################################################################ -LIBS := -llib1 - USER_OBJS := uo1 +LIBS := -llib1 + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk index 9d962fb5338..463597703f3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk @@ -2,24 +2,24 @@ # Automatically-generated file. Do not edit! ################################################################################ -O_SRCS := -CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := -S_UPPER_SRCS := -OBJ_SRCS := ASM_SRCS := -CXX_SRCS := C++_SRCS := CC_SRCS := -OBJS := +CPP_SRCS := +CXX_SRCS := +C_SRCS := +C_UPPER_SRCS := +OBJ_SRCS := +O_SRCS := +S_UPPER_SRCS := C++_DEPS := -C_DEPS := CC_DEPS := CPP_DEPS := -EXECUTABLES := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ 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 97e45a14263..30efe94aa1e 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1/d2/d3/t.cpp \ ../d1/d2/d3/y.cpp -OBJS += \ -./d1/d2/d3/t.o \ -./d1/d2/d3/y.o - CPP_DEPS += \ ./d1/d2/d3/t.d \ ./d1/d2/d3/y.d +OBJS += \ +./d1/d2/d3/t.o \ +./d1/d2/d3/y.o + # Each subdirectory must supply rules for building sources it contributes d1/d2/d3/%.o: ../d1/d2/d3/%.cpp d1/d2/d3/subdir.mk 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 41ca581a94b..81c1cc016e0 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1/d2/e.cpp \ ../d1/d2/r.cpp -OBJS += \ -./d1/d2/e.o \ -./d1/d2/r.o - CPP_DEPS += \ ./d1/d2/e.d \ ./d1/d2/r.d +OBJS += \ +./d1/d2/e.o \ +./d1/d2/r.o + # Each subdirectory must supply rules for building sources it contributes d1/d2/e.o: ../d1/d2/e.cpp d1/d2/subdir.mk 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 b1ed78514ec..ad8bd7f3c56 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 @@ -8,16 +8,16 @@ CPP_SRCS += \ ../d1/u.cpp \ ../d1/w.cpp -OBJS += \ -./d1/q.o \ -./d1/u.o \ -./d1/w.o - CPP_DEPS += \ ./d1/q.d \ ./d1/u.d \ ./d1/w.d +OBJS += \ +./d1/q.o \ +./d1/u.o \ +./d1/w.o + # Each subdirectory must supply rules for building sources it contributes d1/%.o: ../d1/%.cpp d1/subdir.mk 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 c077136c01c..0682cb565b2 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1_1/d2_1/a.cpp \ ../d1_1/d2_1/p.cpp -OBJS += \ -./d1_1/d2_1/a.o \ -./d1_1/d2_1/p.o - CPP_DEPS += \ ./d1_1/d2_1/a.d \ ./d1_1/d2_1/p.d +OBJS += \ +./d1_1/d2_1/a.o \ +./d1_1/d2_1/p.o + # Each subdirectory must supply rules for building sources it contributes d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp d1_1/d2_1/subdir.mk 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 d6a2d577f36..6a4559c5876 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 @@ -7,14 +7,14 @@ CPP_SRCS += \ ../d1_1/i.cpp \ ../d1_1/o.cpp -OBJS += \ -./d1_1/i.o \ -./d1_1/o.o - CPP_DEPS += \ ./d1_1/i.d \ ./d1_1/o.d +OBJS += \ +./d1_1/i.o \ +./d1_1/o.o + # Each subdirectory must supply rules for building sources it contributes d1_1/%.o: ../d1_1/%.cpp d1_1/subdir.mk 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 25c6c4515f2..b8165e9f841 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../dir1/dd/excluded_c/asd/s.cpp -OBJS += \ -./dir1/dd/excluded_c/asd/s.o - CPP_DEPS += \ ./dir1/dd/excluded_c/asd/s.d +OBJS += \ +./dir1/dd/excluded_c/asd/s.o + # 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/subdir.mk 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 68c2cf0a6be..8d500793617 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 @@ -6,12 +6,12 @@ CPP_SRCS += \ ../dir1/dd/excluded_c/inc.cpp -OBJS += \ -./dir1/dd/excluded_c/inc.o - CPP_DEPS += \ ./dir1/dd/excluded_c/inc.d +OBJS += \ +./dir1/dd/excluded_c/inc.o + # Each subdirectory must supply rules for building sources it contributes dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp dir1/dd/excluded_c/subdir.mk 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 79fe1be5fc7..21ab628be91 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 @@ -3,21 +3,21 @@ ################################################################################ # Add inputs and outputs from these tool invocations to the build variables -C_SRCS += \ -../dir1/dd/ff/vbn.c - CPP_SRCS += \ ../dir1/dd/ff/zxc.cpp -OBJS += \ -./dir1/dd/ff/vbn.o \ -./dir1/dd/ff/zxc.o +C_SRCS += \ +../dir1/dd/ff/vbn.c + +CPP_DEPS += \ +./dir1/dd/ff/zxc.d C_DEPS += \ ./dir1/dd/ff/vbn.d -CPP_DEPS += \ -./dir1/dd/ff/zxc.d +OBJS += \ +./dir1/dd/ff/vbn.o \ +./dir1/dd/ff/zxc.o # Each subdirectory must supply rules for building sources it contributes 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 15341fd9355..f4acfa97436 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 @@ -26,15 +26,15 @@ endif ifneq ($(strip $(CC_DEPS)),) -include $(CC_DEPS) endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif ifneq ($(strip $(CPP_DEPS)),) -include $(CPP_DEPS) endif ifneq ($(strip $(CXX_DEPS)),) -include $(CXX_DEPS) endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif ifneq ($(strip $(C_UPPER_DEPS)),) -include $(C_UPPER_DEPS) endif diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk index 367436e715e..4df42a24715 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk @@ -2,7 +2,7 @@ # Automatically-generated file. Do not edit! ################################################################################ -LIBS := -llib2 - USER_OBJS := uo2 +LIBS := -llib2 + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk index d2895268513..463597703f3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk @@ -2,24 +2,24 @@ # Automatically-generated file. Do not edit! ################################################################################ -C_UPPER_SRCS := -C_SRCS := -CPP_SRCS := -O_SRCS := ASM_SRCS := -S_UPPER_SRCS := C++_SRCS := -CXX_SRCS := CC_SRCS := +CPP_SRCS := +CXX_SRCS := +C_SRCS := +C_UPPER_SRCS := OBJ_SRCS := -OBJS := +O_SRCS := +S_UPPER_SRCS := C++_DEPS := -EXECUTABLES := CC_DEPS := -C_DEPS := CPP_DEPS := CXX_DEPS := +C_DEPS := C_UPPER_DEPS := +EXECUTABLES := +OBJS := # Every subdirectory with source files must be described here SUBDIRS := \ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/GnuMakefileGenerator.java index 90ed3f48223..e1fecedcc38 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/GnuMakefileGenerator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/GnuMakefileGenerator.java @@ -39,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.TreeMap; import java.util.TreeSet; import java.util.Vector; import java.util.regex.Matcher; @@ -394,13 +395,15 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { private IPath topBuildDir; // Build directory - relative to the workspace // private Set outputExtensionsSet; //=== Maps of macro names (String) to values (List) + // These are TreeMaps to avoid nondeterministic output because the + // makefile output depends on their iteration order (bug 575702). // Map of source file build variable names to a List of source file Path's - private final HashMap<String, List<IPath>> buildSrcVars = new HashMap<>(); + private final Map<String, List<IPath>> buildSrcVars = new TreeMap<>(); // Map of output file build variable names to a List of output file Path's - private final HashMap<String, List<IPath>> buildOutVars = new HashMap<>(); + private final Map<String, List<IPath>> buildOutVars = new TreeMap<>(); // Map of dependency file build variable names to a List of GnuDependencyGroupInfo objects - private final HashMap<String, GnuDependencyGroupInfo> buildDepVars = new HashMap<>(); - private final Map<String, Set<String>> topBuildOutVars = new LinkedHashMap<>(); + private final Map<String, GnuDependencyGroupInfo> buildDepVars = new TreeMap<>(); + private final Map<String, Set<String>> topBuildOutVars = new TreeMap<>(); // Dependency file variables // private Vector dependencyMakefiles; // IPath's - relative to the top build directory or absolute @@ -4176,7 +4179,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { * * @return HashMap */ - public HashMap<String, List<IPath>> getBuildOutputVars() { + public Map<String, List<IPath>> getBuildOutputVars() { return buildOutVars; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/ManagedBuildGnuToolInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/ManagedBuildGnuToolInfo.java index 84ec3f761cb..8e65a0b908e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/ManagedBuildGnuToolInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/ManagedBuildGnuToolInfo.java @@ -735,7 +735,7 @@ public class ManagedBuildGnuToolInfo { for (Entry<String, List<IPath>> entry : entrySet) { String macroName = entry.getKey(); List<IPath> newMacroValue = entry.getValue(); - HashMap<String, List<IPath>> map = makeGen.getBuildOutputVars(); + Map<String, List<IPath>> map = makeGen.getBuildOutputVars(); if (map.containsKey(macroName)) { List<IPath> macroValue = map.get(macroName); macroValue.addAll(newMacroValue); @@ -947,7 +947,7 @@ public class ManagedBuildGnuToolInfo { for (Entry<String, List<IPath>> entry : entrySet) { String macroName = entry.getKey(); List<IPath> newMacroValue = entry.getValue(); - HashMap<String, List<IPath>> map = makeGen.getBuildOutputVars(); + Map<String, List<IPath>> map = makeGen.getBuildOutputVars(); if (map.containsKey(macroName)) { List<IPath> macroValue = map.get(macroName); macroValue.addAll(newMacroValue); |