aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-05-27 17:24:09 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-05-27 17:24:09 +0000
commit0389288e270b355aacda2ad22302c7c264b58212 (patch)
tree758142d18ca8546f4b52538d1f3f2ad92b41c1b5
parentc3dd6ac7814ce17004a9e4f0d965d606b1d7c35c (diff)
parentb017b41e91f7eb7bb83d1466b45c24e01ac2e309 (diff)
downloadlufa-0389288e270b355aacda2ad22302c7c264b58212.tar.gz
lufa-0389288e270b355aacda2ad22302c7c264b58212.tar.bz2
lufa-0389288e270b355aacda2ad22302c7c264b58212.zip
AppConfigHeaders: Merge in latest trunk.
Diffstat
-rw-r--r--BuildTests/BoardDriverTest/makefile.avr84
-rw-r--r--BuildTests/BoardDriverTest/makefile.uc34
-rw-r--r--BuildTests/BoardDriverTest/makefile.xmega4
-rw-r--r--BuildTests/ModuleTest/makefile.avr84
-rw-r--r--BuildTests/ModuleTest/makefile.uc34
-rw-r--r--BuildTests/ModuleTest/makefile.xmega4
-rw-r--r--BuildTests/SingleUSBModeTest/makefile.avr84
-rw-r--r--BuildTests/SingleUSBModeTest/makefile.uc34
-rw-r--r--BuildTests/SingleUSBModeTest/makefile.xmega4
-rw-r--r--Maintenance/makefile12
10 files changed, 24 insertions, 24 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.
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="<OTHERFILE>`basename $$project_makefile`<\/OTHERFILE>"; \
gcc_source_files=""; \
for c_source_file in `find $$target_folder -name *.c`; do \
- source_files+="<SOURCEFILE>`basename $$c_source_file`<\/SOURCEFILE>"; \
- gcc_source_files+="<Name>`basename $$c_source_file`<\/Name>"; \
+ source_files="$$source_files<SOURCEFILE>`basename $$c_source_file`<\/SOURCEFILE>"; \
+ gcc_source_files="$$gcc_source_files<Name>`basename $$c_source_file`<\/Name>"; \
done; \
for c_header_file in `find $$target_folder -name *.h`; do \
- source_files+="<HEADERFILE>`basename $$c_header_file`<\/HEADERFILE>"; \
- gcc_source_files+="<Name>`basename $$c_header_file`<\/Name>"; \
+ source_files="$$source_files<HEADERFILE>`basename $$c_header_file`<\/HEADERFILE>"; \
+ gcc_source_files="$$gcc_source_files<Name>`basename $$c_header_file`<\/Name>"; \
done; \
for assembly_file in `find $$target_folder -name *.S`; do \
- source_files+="<OTHERFILE>`basename $$assembly_file`<\/OTHERFILE>"; \
- gcc_source_files+="<Name>`basename $$assembly_file`<\/Name>"; \
+ source_files="$$source_files<OTHERFILE>`basename $$assembly_file`<\/OTHERFILE>"; \
+ gcc_source_files="$$gcc_source_files<Name>`basename $$assembly_file`<\/Name>"; \
done; \
\
sed "s/%TARGET%/$$target_name/g" AS4Template.aps > $$target_folder/$$target_name.aps.new; \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 01:40:05 +0000