Update tests because of dependency calculation changes and Echo changes

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

@@ -1,43 +1,43 @@
-################################################################################
+################################################################################
-# Automatically-generated file. Do not edit!
+# Automatically-generated file. Do not edit!
-################################################################################
+################################################################################
-
+
-ROOT := ..
+ROOT := ..
-
+
--include $(ROOT)/makefile.init
+-include $(ROOT)/makefile.init
-
+
-RM := rm -rf
+RM := rm -rf
-
+
-# All of the sources participating in the build are defined here
+# All of the sources participating in the build are defined here
--include sources.mk
+-include sources.mk
--include $(SUBDIRS:%=%/subdir.mk)
+-include $(SUBDIRS:%=%/subdir.mk)
--include objects.mk
+-include objects.mk
-ifneq ($(strip $(DEPS)),)
+ifneq ($(strip $(DEPS)),)
--include $(DEPS)
+-include $(DEPS)
-endif
+endif
-
+
--include $(ROOT)/makefile.defs
+-include $(ROOT)/makefile.defs
-
+
-# Add inputs and outputs from these tool invocations to the build variables 
+# Add inputs and outputs from these tool invocations to the build variables 
-
+
-# All Target
+# All Target
-all: lib.a
+all: lib.a
-
+
-# Tool invocations
+# Tool invocations
-lib.a: $(OBJS) $(USER_OBJS)
+lib.a: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
+	@echo 'Building target: $@'
-	@echo 'Invoking: MBS30.archiver.gnu'
+	@echo 'Invoking: MBS30.archiver.gnu'
-	@echo ar -r lib.a $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo ar -r lib.a $(OBJS) $(USER_OBJS) $(LIBS)
-	@ar -r lib.a $(OBJS) $(USER_OBJS) $(LIBS)
+	@ar -r lib.a $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
+	@echo 'Finished building target: $@'
-	@echo ' '
+	@echo ' '
-
+
-# Other Targets
+# Other Targets
-clean:
+clean:
-	-$(RM) $(OBJS)$(ARCHIVES)$(DEPS) lib.a
+	-$(RM) $(OBJS)$(ARCHIVES)$(DEPS) lib.a
-	-@echo ' '
+	-@echo ' '
-
+
-.PHONY: all clean dependents
+.PHONY: all clean dependents
-.SECONDARY:
+.SECONDARY:
-
+
--include $(ROOT)/makefile.targets
+-include $(ROOT)/makefile.targets

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

@@ -1,7 +1,7 @@
-################################################################################
+################################################################################
-# Automatically-generated file. Do not edit!
+# Automatically-generated file. Do not edit!
-################################################################################
+################################################################################
-
+
-LIBS :=
+LIBS :=
-
+
 USER_OBJS :=

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

@@ -1,14 +1,14 @@
-################################################################################
+################################################################################
-# Automatically-generated file. Do not edit!
+# Automatically-generated file. Do not edit!
-################################################################################
+################################################################################
-
+
-C_SRCS := 
+C_SRCS := 
-O_SRCS := 
+O_SRCS := 
-OBJS := 
+OBJS := 
-ARCHIVES := 
+ARCHIVES := 
-DEPS := 
+DEPS := 
-
+
-# Every subdirectory with source files must be described here
+# Every subdirectory with source files must be described here
-SUBDIRS := \
+SUBDIRS := \
-. \
+. \
-
+

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

@@ -1,34 +1,34 @@
-################################################################################
+################################################################################
-# Automatically-generated file. Do not edit!
+# Automatically-generated file. Do not edit!
-################################################################################
+################################################################################
-
+
-# Add inputs and outputs from these tool invocations to the build variables 
+# Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
+C_SRCS += \
-$(ROOT)/f1.c \
+$(ROOT)/f1.c \
-$(ROOT)/f2.c 
+$(ROOT)/f2.c 
-
+
-OBJS += \
+OBJS += \
-${addprefix ./, \
+${addprefix ./, \
-f1.o \
+f1.o \
-f2.o \
+f2.o \
-}
+}
-
+
-DEPS += \
+DEPS += \
-${addprefix ./, \
+${addprefix ./, \
-f1.d \
+f1.d \
-f2.d \
+f2.d \
-}
+}
-
+
-
+
-# Each subdirectory must supply rules for building sources it contributes
+# Each subdirectory must supply rules for building sources it contributes
-%.o: $(ROOT)/%.c
+%.o: $(ROOT)/%.c
-	@echo 'Building file: $<'
+	@echo 'Building file: $<'
-	@echo 'Invoking: MBS30.compiler.gnu.c'
+	@echo 'Invoking: MBS30.compiler.gnu.c'
-	@echo gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $<
+	@echo gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $<
-	@gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $< && \
+	@gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $< && \
-	echo -n $(@:%.o=%.d) $(dir $@) > $(@:%.o=%.d) && \
+	echo -n $(@:%.o=%.d) $(dir $@) > $(@:%.o=%.d) && \
-	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  $< >> $(@:%.o=%.d)
+	gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0  $< >> $(@:%.o=%.d)
-	@echo 'Finished building: $<'
+	@echo 'Finished building: $<'
-	@echo ' '
+	@echo ' '
-
+
-
+

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f1.c

@@ -1,8 +1,8 @@
-#include <stdio.h>
+#include <stdio.h>
-#include "test_ar.h"
+#include "test_ar.h"
-
+
-void f1_ar()
+void f1_ar()
-{
+{
-	printf ( "Hello from f1_ar.\n" ) ;
+	printf ( "Hello from f1_ar.\n" ) ;
-	return ;
+	return ;
-}
+}

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f2.c

@@ -1,8 +1,8 @@
-#include <stdio.h>
+#include <stdio.h>
-#include "test_ar.h"
+#include "test_ar.h"
-
+
-void f2_ar()
+void f2_ar()
-{
+{
-	printf ( "Hello from f2_ar.\n" ) ;
+	printf ( "Hello from f2_ar.\n" ) ;
-	return ;
+	return ;
-}
+}

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/test_ar.h

@@ -1,2 +1,2 @@
-void f1_ar() ;
+void f1_ar() ;
-void f2_ar() ;
+void f2_ar() ;

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f1.c

@@ -1,8 +1,8 @@
-#include <stdio.h>
+#include <stdio.h>
-#include "test_ar.h"
+#include "test_ar.h"
-
+
-void f1_ar()
+void f1_ar()
-{
+{
-	printf ( "Hello from f1_ar.\n" ) ;
+	printf ( "Hello from f1_ar.\n" ) ;
-	return ;
+	return ;
-}
+}

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f2.c

@@ -1,8 +1,8 @@
-#include <stdio.h>
+#include <stdio.h>
-#include "test_ar.h"
+#include "test_ar.h"
-
+
-void f2_ar()
+void f2_ar()
-{
+{
-	printf ( "Hello from f2_ar.\n" ) ;
+	printf ( "Hello from f2_ar.\n" ) ;
-	return ;
+	return ;
-}
+}

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/test_ar.h

@@ -1,2 +1,2 @@
-void f1_ar() ;
+void f1_ar() ;
-void f2_ar() ;
+void f2_ar() ;