From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 12 Apr 2011 04:57:47 +0000 (+0000)
Subject: Slight cleanups to the architecture specific makefile templates to make the common... 
X-Git-Tag: LUFA-110528-BETA~4
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/4b1f6cac75a86874d2a15e1893cfb258b2397fb5

Slight cleanups to the architecture specific makefile templates to make the common configuration sections as identical as possible.
---

diff --git a/LUFA/CodeTemplates/makefile_template.avr8 b/LUFA/CodeTemplates/makefile_template.avr8
index be1e68429..106f81cdc 100644
--- a/LUFA/CodeTemplates/makefile_template.avr8
+++ b/LUFA/CodeTemplates/makefile_template.avr8
@@ -133,6 +133,7 @@ SRC = $(TARGET).c                                                 \
 	  $(LUFA_SRC_USBCLASS)
       ### INSERT ADDITIONAL PROJECT SOURCE FILENAMES OR LUFA MODULE NAMES HERE ###
 
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -153,13 +154,6 @@ ASRC =
 OPT = s
 
 
-# Debugging format.
-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
-#     AVR Studio 4.10 requires dwarf-2.
-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
-DEBUG = dwarf-2
-
-
 # List any extra directories to look for include files here.
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
@@ -172,7 +166,7 @@ EXTRAINCDIRS = $(LUFA_PATH)/
 #     gnu89 = c89 plus GCC extensions
 #     c99   = ISO C99 standard (not yet fully implemented)
 #     gnu99 = c99 plus GCC extensions
-CSTANDARD = -std=c99
+CSTANDARD = -std=gnu99
 
 
 # Place -D or -U options here for C sources
@@ -196,10 +190,14 @@ CPPDEFS += -DF_USB=$(F_USB)UL
 CPPDEFS += -DBOARD=BOARD_$(BOARD)
 CPPDEFS += -DARCH=ARCH_$(ARCH)
 CPPDEFS += $(LUFA_OPTS)
-#CPPDEFS += -D__STDC_LIMIT_MACROS
-#CPPDEFS += -D__STDC_CONSTANT_MACROS
 
 
+# Debugging format.
+#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
+#     AVR Studio 4.10 requires dwarf-2.
+#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
+DEBUG = dwarf-2
+
 
 #---------------- Compiler Options C ----------------
 #  -g*:          generate debugging information
diff --git a/LUFA/CodeTemplates/makefile_template.uc3 b/LUFA/CodeTemplates/makefile_template.uc3
index 6ac2e8b05..843d775af 100644
--- a/LUFA/CodeTemplates/makefile_template.uc3
+++ b/LUFA/CodeTemplates/makefile_template.uc3
@@ -76,7 +76,7 @@ F_CPU = ### INSERT PRESCALED SYSTEM CLOCK SPEED HERE, IN HZ ###
 #     clock rate.
 #
 #     For the UC3 chips, this should be equal to 48MHz or 96MHz.
-F_USB = 48000000
+F_USB = ### INSERT CLOCK TO USB MODULE HERE, IN HZ ###
 
 
 # Output format. (can be srec, ihex, binary)
@@ -132,10 +132,6 @@ ASRC =
 OPT = s
 
 
-# Debugging level.
-DEBUG = 3
-
-
 # List any extra directories to look for include files here.
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
@@ -174,6 +170,9 @@ CPPDEFS += -DARCH=ARCH_$(ARCH)
 CPPDEFS += $(LUFA_OPTS)
 
 
+# Debugging level.
+DEBUG = 3
+
 
 #---------------- Compiler Options C ----------------
 #  -g*:          generate debugging information