From 96462ac746218d8a2eff596544ad4bef481402ea Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 27 May 2012 17:11:43 +0000 Subject: Oops - shell variables can't use the += operator - must reference the existing value in the new value to append. --- Maintenance/makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Maintenance/makefile b/Maintenance/makefile index 84e4a703f..19ea32b67 100644 --- a/Maintenance/makefile +++ b/Maintenance/makefile @@ -40,16 +40,16 @@ make-as4-projects: source_files="`basename $$project_makefile`<\/OTHERFILE>"; \ gcc_source_files=""; \ for c_source_file in `find $$target_folder -name *.c`; do \ - source_files+="`basename $$c_source_file`<\/SOURCEFILE>"; \ - gcc_source_files+="`basename $$c_source_file`<\/Name>"; \ + source_files="$$source_files`basename $$c_source_file`<\/SOURCEFILE>"; \ + gcc_source_files="$$gcc_source_files`basename $$c_source_file`<\/Name>"; \ done; \ for c_header_file in `find $$target_folder -name *.h`; do \ - source_files+="`basename $$c_header_file`<\/HEADERFILE>"; \ - gcc_source_files+="`basename $$c_header_file`<\/Name>"; \ + source_files="$$source_files`basename $$c_header_file`<\/HEADERFILE>"; \ + gcc_source_files="$$gcc_source_files`basename $$c_header_file`<\/Name>"; \ done; \ for assembly_file in `find $$target_folder -name *.S`; do \ - source_files+="`basename $$assembly_file`<\/OTHERFILE>"; \ - gcc_source_files+="`basename $$assembly_file`<\/Name>"; \ + source_files="$$source_files`basename $$assembly_file`<\/OTHERFILE>"; \ + gcc_source_files="$$gcc_source_files`basename $$assembly_file`<\/Name>"; \ done; \ \ sed "s/%TARGET%/$$target_name/g" AS4Template.aps > $$target_folder/$$target_name.aps.new; \ -- cgit v1.2.3 From b017b41e91f7eb7bb83d1466b45c24e01ac2e309 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 27 May 2012 17:23:41 +0000 Subject: Don't generate dependency files or a MAP file when running BuildTests where possible. --- BuildTests/BoardDriverTest/makefile.avr8 | 4 ++-- BuildTests/BoardDriverTest/makefile.uc3 | 4 ++-- BuildTests/BoardDriverTest/makefile.xmega | 4 ++-- BuildTests/ModuleTest/makefile.avr8 | 4 ++-- BuildTests/ModuleTest/makefile.uc3 | 4 ++-- BuildTests/ModuleTest/makefile.xmega | 4 ++-- BuildTests/SingleUSBModeTest/makefile.avr8 | 4 ++-- BuildTests/SingleUSBModeTest/makefile.uc3 | 4 ++-- BuildTests/SingleUSBModeTest/makefile.xmega | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/BuildTests/BoardDriverTest/makefile.avr8 b/BuildTests/BoardDriverTest/makefile.avr8 index 7c213f8d2..8840cee81 100644 --- a/BuildTests/BoardDriverTest/makefile.avr8 +++ b/BuildTests/BoardDriverTest/makefile.avr8 @@ -321,7 +321,7 @@ EXTMEMOPTS = # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--gc-sections LDFLAGS += $(EXTMEMOPTS) @@ -445,7 +445,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/BoardDriverTest/makefile.uc3 b/BuildTests/BoardDriverTest/makefile.uc3 index fce4b1046..be9e93156 100644 --- a/BuildTests/BoardDriverTest/makefile.uc3 +++ b/BuildTests/BoardDriverTest/makefile.uc3 @@ -230,7 +230,7 @@ ASFLAGS = $(ADEFS) # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--gc-sections --rodata-writable LDFLAGS += -Wl,--direct-data #LDFLAGS += -T linker_script.x @@ -283,7 +283,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/BoardDriverTest/makefile.xmega b/BuildTests/BoardDriverTest/makefile.xmega index a099622f9..ef6dfe10a 100644 --- a/BuildTests/BoardDriverTest/makefile.xmega +++ b/BuildTests/BoardDriverTest/makefile.xmega @@ -303,7 +303,7 @@ EXTMEMOPTS = # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--gc-sections LDFLAGS += $(EXTMEMOPTS) @@ -427,7 +427,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/ModuleTest/makefile.avr8 b/BuildTests/ModuleTest/makefile.avr8 index 58fd5a47b..867320945 100644 --- a/BuildTests/ModuleTest/makefile.avr8 +++ b/BuildTests/ModuleTest/makefile.avr8 @@ -339,7 +339,7 @@ EXTMEMOPTS = # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--gc-sections LDFLAGS += $(EXTMEMOPTS) @@ -463,7 +463,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/ModuleTest/makefile.uc3 b/BuildTests/ModuleTest/makefile.uc3 index 9c01edf0b..5628748ee 100644 --- a/BuildTests/ModuleTest/makefile.uc3 +++ b/BuildTests/ModuleTest/makefile.uc3 @@ -257,7 +257,7 @@ ASFLAGS = $(ADEFS) # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--gc-sections --rodata-writable LDFLAGS += -Wl,--direct-data #LDFLAGS += -T linker_script.x @@ -310,7 +310,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/ModuleTest/makefile.xmega b/BuildTests/ModuleTest/makefile.xmega index 3da056646..0a2f50147 100644 --- a/BuildTests/ModuleTest/makefile.xmega +++ b/BuildTests/ModuleTest/makefile.xmega @@ -331,7 +331,7 @@ EXTMEMOPTS = # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--gc-sections LDFLAGS += $(EXTMEMOPTS) @@ -455,7 +455,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/SingleUSBModeTest/makefile.avr8 b/BuildTests/SingleUSBModeTest/makefile.avr8 index 462f44a2c..d38b0e12b 100644 --- a/BuildTests/SingleUSBModeTest/makefile.avr8 +++ b/BuildTests/SingleUSBModeTest/makefile.avr8 @@ -322,7 +322,7 @@ EXTMEMOPTS = # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--gc-sections LDFLAGS += $(EXTMEMOPTS) @@ -446,7 +446,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/SingleUSBModeTest/makefile.uc3 b/BuildTests/SingleUSBModeTest/makefile.uc3 index fa13f795a..b86bb886b 100644 --- a/BuildTests/SingleUSBModeTest/makefile.uc3 +++ b/BuildTests/SingleUSBModeTest/makefile.uc3 @@ -231,7 +231,7 @@ ASFLAGS = $(ADEFS) # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--gc-sections --rodata-writable LDFLAGS += -Wl,--direct-data #LDFLAGS += -T linker_script.x @@ -284,7 +284,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. diff --git a/BuildTests/SingleUSBModeTest/makefile.xmega b/BuildTests/SingleUSBModeTest/makefile.xmega index 022f7bfad..868bb500a 100644 --- a/BuildTests/SingleUSBModeTest/makefile.xmega +++ b/BuildTests/SingleUSBModeTest/makefile.xmega @@ -304,7 +304,7 @@ EXTMEMOPTS = # -Wl,...: tell GCC to pass this to linker. # -Map: create map file # --cref: add cross reference to map file -LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +#LDFLAGS = -Wl,-Map=$(TARGET).map,--cref LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--gc-sections LDFLAGS += $(EXTMEMOPTS) @@ -428,7 +428,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB # Compiler flags to generate dependency files. -GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d +#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d # Combine all necessary flags and optional flags. -- cgit v1.2.3