AppConfigHeaders: Merge in latest trunk.

diff --git a/BuildTests/BoardDriverTest/makefile.avr8 b/BuildTests/BoardDriverTest/makefile.avr8
index 7c213f8..8840cee 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile.avr8
+++ b/BuildTests/BoardDriverTest/makefile.avr8
@@ -321,7 +321,7 @@ EXTMEMOPTS =
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--relax\r
 LDFLAGS += -Wl,--gc-sections\r
 LDFLAGS += $(EXTMEMOPTS)\r
@@ -445,7 +445,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/BoardDriverTest/makefile.uc3 b/BuildTests/BoardDriverTest/makefile.uc3
index fce4b10..be9e931 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile.uc3
+++ b/BuildTests/BoardDriverTest/makefile.uc3
@@ -230,7 +230,7 @@ ASFLAGS = $(ADEFS)
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--gc-sections --rodata-writable\r
 LDFLAGS += -Wl,--direct-data\r
 #LDFLAGS += -T linker_script.x\r
@@ -283,7 +283,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/BoardDriverTest/makefile.xmega b/BuildTests/BoardDriverTest/makefile.xmega
index a099622..ef6dfe1 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile.xmega
+++ b/BuildTests/BoardDriverTest/makefile.xmega
@@ -303,7 +303,7 @@ EXTMEMOPTS =
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--relax \r
 LDFLAGS += -Wl,--gc-sections\r
 LDFLAGS += $(EXTMEMOPTS)\r
@@ -427,7 +427,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/ModuleTest/makefile.avr8 b/BuildTests/ModuleTest/makefile.avr8
index 58fd5a4..8673209 100644 (file)
--- a/BuildTests/ModuleTest/makefile.avr8
+++ b/BuildTests/ModuleTest/makefile.avr8
@@ -339,7 +339,7 @@ EXTMEMOPTS =
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--relax\r
 LDFLAGS += -Wl,--gc-sections\r
 LDFLAGS += $(EXTMEMOPTS)\r
@@ -463,7 +463,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/ModuleTest/makefile.uc3 b/BuildTests/ModuleTest/makefile.uc3
index 9c01edf..5628748 100644 (file)
--- a/BuildTests/ModuleTest/makefile.uc3
+++ b/BuildTests/ModuleTest/makefile.uc3
@@ -257,7 +257,7 @@ ASFLAGS = $(ADEFS)
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--gc-sections --rodata-writable\r
 LDFLAGS += -Wl,--direct-data\r
 #LDFLAGS += -T linker_script.x\r
@@ -310,7 +310,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/ModuleTest/makefile.xmega b/BuildTests/ModuleTest/makefile.xmega
index 3da0566..0a2f501 100644 (file)
--- a/BuildTests/ModuleTest/makefile.xmega
+++ b/BuildTests/ModuleTest/makefile.xmega
@@ -331,7 +331,7 @@ EXTMEMOPTS =
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--relax \r
 LDFLAGS += -Wl,--gc-sections\r
 LDFLAGS += $(EXTMEMOPTS)\r
@@ -455,7 +455,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/SingleUSBModeTest/makefile.avr8 b/BuildTests/SingleUSBModeTest/makefile.avr8
index 462f44a..d38b0e1 100644 (file)
--- a/BuildTests/SingleUSBModeTest/makefile.avr8
+++ b/BuildTests/SingleUSBModeTest/makefile.avr8
@@ -322,7 +322,7 @@ EXTMEMOPTS =
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--relax\r
 LDFLAGS += -Wl,--gc-sections\r
 LDFLAGS += $(EXTMEMOPTS)\r
@@ -446,7 +446,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/SingleUSBModeTest/makefile.uc3 b/BuildTests/SingleUSBModeTest/makefile.uc3
index fa13f79..b86bb88 100644 (file)
--- a/BuildTests/SingleUSBModeTest/makefile.uc3
+++ b/BuildTests/SingleUSBModeTest/makefile.uc3
@@ -231,7 +231,7 @@ ASFLAGS = $(ADEFS)
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--gc-sections --rodata-writable\r
 LDFLAGS += -Wl,--direct-data\r
 #LDFLAGS += -T linker_script.x\r
@@ -284,7 +284,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/BuildTests/SingleUSBModeTest/makefile.xmega b/BuildTests/SingleUSBModeTest/makefile.xmega
index 022f7bf..868bb50 100644 (file)
--- a/BuildTests/SingleUSBModeTest/makefile.xmega
+++ b/BuildTests/SingleUSBModeTest/makefile.xmega
@@ -304,7 +304,7 @@ EXTMEMOPTS =
 #  -Wl,...:     tell GCC to pass this to linker.\r
 #    -Map:      create map file\r
 #    --cref:    add cross reference to  map file\r
-LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
+#LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref\r
 LDFLAGS += -Wl,--relax \r
 LDFLAGS += -Wl,--gc-sections\r
 LDFLAGS += $(EXTMEMOPTS)\r
@@ -428,7 +428,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
 \r
 \r
 # Compiler flags to generate dependency files.\r
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
+#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d\r
 \r
 \r
 # Combine all necessary flags and optional flags.\r

diff --git a/Maintenance/makefile b/Maintenance/makefile
index 84e4a70..19ea32b 100644 (file)
--- a/Maintenance/makefile
+++ b/Maintenance/makefile
@@ -40,16 +40,16 @@ make-as4-projects:
                source_files="<OTHERFILE>`basename $$project_makefile`<\/OTHERFILE>"; \\r
                gcc_source_files=""; \\r
                for c_source_file in `find $$target_folder -name *.c`; do \\r
-                 source_files+="<SOURCEFILE>`basename $$c_source_file`<\/SOURCEFILE>"; \\r
-                 gcc_source_files+="<Name>`basename $$c_source_file`<\/Name>"; \\r
+                 source_files="$$source_files<SOURCEFILE>`basename $$c_source_file`<\/SOURCEFILE>"; \\r
+                 gcc_source_files="$$gcc_source_files<Name>`basename $$c_source_file`<\/Name>"; \\r
                done; \\r
                for c_header_file in `find $$target_folder -name *.h`; do \\r
-                 source_files+="<HEADERFILE>`basename $$c_header_file`<\/HEADERFILE>"; \\r
-                 gcc_source_files+="<Name>`basename $$c_header_file`<\/Name>"; \\r
+                 source_files="$$source_files<HEADERFILE>`basename $$c_header_file`<\/HEADERFILE>"; \\r
+                 gcc_source_files="$$gcc_source_files<Name>`basename $$c_header_file`<\/Name>"; \\r
                done; \\r
                for assembly_file in `find $$target_folder -name *.S`; do \\r
-                 source_files+="<OTHERFILE>`basename $$assembly_file`<\/OTHERFILE>"; \\r
-                 gcc_source_files+="<Name>`basename $$assembly_file`<\/Name>"; \\r
+                 source_files="$$source_files<OTHERFILE>`basename $$assembly_file`<\/OTHERFILE>"; \\r
+                 gcc_source_files="$$gcc_source_files<Name>`basename $$assembly_file`<\/Name>"; \\r
                done; \\r
                \\r
            sed "s/%TARGET%/$$target_name/g" AS4Template.aps > $$target_folder/$$target_name.aps.new; \\r