Slight cleanups to the architecture specific makefile templates to make the common...

diff --git a/LUFA/CodeTemplates/makefile_template.avr8 b/LUFA/CodeTemplates/makefile_template.avr8
index be1e684..106f81c 100644 (file)
--- a/LUFA/CodeTemplates/makefile_template.avr8
+++ b/LUFA/CodeTemplates/makefile_template.avr8
@@ -133,6 +133,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_SRC_USBCLASS)\r
       ### INSERT ADDITIONAL PROJECT SOURCE FILENAMES OR LUFA MODULE NAMES HERE ###\r
 \r
          $(LUFA_SRC_USBCLASS)\r
       ### INSERT ADDITIONAL PROJECT SOURCE FILENAMES OR LUFA MODULE NAMES HERE ###\r
 \r

+\r

 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r


@@ -153,13 +154,6 @@ ASRC =
 OPT = s\r
 \r
 \r
 OPT = s\r
 \r
 \r

-# Debugging format.\r
-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.\r
-#     AVR Studio 4.10 requires dwarf-2.\r
-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.\r
-DEBUG = dwarf-2\r
-\r
-\r

 # List any extra directories to look for include files here.\r
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 # List any extra directories to look for include files here.\r
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r


@@ -172,7 +166,7 @@ EXTRAINCDIRS = $(LUFA_PATH)/
 #     gnu89 = c89 plus GCC extensions\r
 #     c99   = ISO C99 standard (not yet fully implemented)\r
 #     gnu99 = c99 plus GCC extensions\r
 #     gnu89 = c89 plus GCC extensions\r
 #     c99   = ISO C99 standard (not yet fully implemented)\r
 #     gnu99 = c99 plus GCC extensions\r

-CSTANDARD = -std=c99\r
+CSTANDARD = -std=gnu99\r

 \r
 \r
 # Place -D or -U options here for C sources\r
 \r
 \r
 # Place -D or -U options here for C sources\r


@@ -196,10 +190,14 @@ CPPDEFS += -DF_USB=$(F_USB)UL
 CPPDEFS += -DBOARD=BOARD_$(BOARD)\r
 CPPDEFS += -DARCH=ARCH_$(ARCH)\r
 CPPDEFS += $(LUFA_OPTS)\r
 CPPDEFS += -DBOARD=BOARD_$(BOARD)\r
 CPPDEFS += -DARCH=ARCH_$(ARCH)\r
 CPPDEFS += $(LUFA_OPTS)\r

-#CPPDEFS += -D__STDC_LIMIT_MACROS\r
-#CPPDEFS += -D__STDC_CONSTANT_MACROS\r

 \r
 \r
 \r
 \r

+# Debugging format.\r
+#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.\r
+#     AVR Studio 4.10 requires dwarf-2.\r
+#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.\r
+DEBUG = dwarf-2\r
+\r

 \r
 #---------------- Compiler Options C ----------------\r
 #  -g*:          generate debugging information\r
 \r
 #---------------- Compiler Options C ----------------\r
 #  -g*:          generate debugging information\r

diff --git a/LUFA/CodeTemplates/makefile_template.uc3 b/LUFA/CodeTemplates/makefile_template.uc3
index 6ac2e8b..843d775 100644 (file)
--- 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.\r
 #\r
 #     For the UC3 chips, this should be equal to 48MHz or 96MHz.\r
 #     clock rate.\r
 #\r
 #     For the UC3 chips, this should be equal to 48MHz or 96MHz.\r

-F_USB = 48000000\r
+F_USB = ### INSERT CLOCK TO USB MODULE HERE, IN HZ ###\r

 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r


@@ -132,10 +132,6 @@ ASRC =
 OPT = s\r
 \r
 \r
 OPT = s\r
 \r
 \r

-# Debugging level.\r
-DEBUG = 3\r
-\r
-\r

 # List any extra directories to look for include files here.\r
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 # List any extra directories to look for include files here.\r
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r


@@ -174,6 +170,9 @@ CPPDEFS += -DARCH=ARCH_$(ARCH)
 CPPDEFS += $(LUFA_OPTS)\r
 \r
 \r
 CPPDEFS += $(LUFA_OPTS)\r
 \r
 \r

+# Debugging level.\r
+DEBUG = 3\r
+\r

 \r
 #---------------- Compiler Options C ----------------\r
 #  -g*:          generate debugging information\r
 \r
 #---------------- Compiler Options C ----------------\r
 #  -g*:          generate debugging information\r