Oops - really fix logic errors in USBMode.h.

[pub/USBasp.git] / BuildTests / ModuleTest / makefile.test

diff --git a/BuildTests/ModuleTest/makefile.test b/BuildTests/ModuleTest/makefile.test
index 94004b8..f92ef9c 100644 (file)
--- a/BuildTests/ModuleTest/makefile.test
+++ b/BuildTests/ModuleTest/makefile.test
@@ -9,10 +9,14 @@
 #         LUFA Project Makefile.\r
 # --------------------------------------\r
 \r
-MCU          = at90usb1287\r
-ARCH         = AVR8\r
+MCU          = \r
+ARCH         = \r
 BOARD        = NONE\r
-F_CPU        = 8000000\r
+F_CPU        = $(F_USB)\r
+OPTIMIZATION = 1\r
+TARGET       = Test\r
+SRC          = $(TARGET)_C.c $(TARGET)_CPP.cpp Dummy.S $(LUFA_SRC_USB)\r
+LUFA_PATH    = ../../LUFA/\r
 \r
 ifeq ($(ARCH), AVR8)\r
 F_USB        = 8000000\r
@@ -22,13 +26,9 @@ else ifeq ($(ARCH), UC3)
 F_USB        = 48000000\r
 endif\r
 \r
-OPTIMIZATION = 1\r
-TARGET       = Test\r
-SRC          = $(TARGET)_C.c $(TARGET)_CPP.cpp Dummy.S $(LUFA_SRC_USB)\r
-LUFA_PATH    = ../../LUFA/\r
-\r
-CC_FLAGS     = -Wextra\r
-#CC_FLAGS += -Werror # FIXME\r
+# Generic C/C++ compiler flags\r
+CC_FLAGS  = -Wextra\r
+CC_FLAGS += -Werror\r
 CC_FLAGS += -Wformat=2\r
 CC_FLAGS += -Winit-self\r
 CC_FLAGS += -Wswitch-enum\r
@@ -38,11 +38,9 @@ CC_FLAGS += -Wpointer-arith
 CC_FLAGS += -Wcast-align\r
 CC_FLAGS += -Wwrite-strings\r
 CC_FLAGS += -Wlogical-op\r
-CC_FLAGS += -Wmissing-parameter-type\r
 CC_FLAGS += -Wmissing-declarations\r
 CC_FLAGS += -Wmissing-field-initializers\r
 CC_FLAGS += -Wmissing-format-attribute\r
-CC_FLAGS += -Wnested-externs\r
 CC_FLAGS += -Woverlength-strings\r
 \r
 # Only enable rendundant declaration warnings for AVR8 target (FIXME)\r
@@ -50,6 +48,10 @@ ifeq ($(ARCH), AVR8)
 CC_FLAGS += -Wredundant-decls\r
 endif\r
 \r
+# C compiler only flags\r
+C_FLAGS += -Wmissing-parameter-type\r
+C_FLAGS += -Wnested-externs\r
+\r
 # Potential additional warnings to enable in the future (FIXME)\r
 #CC_FLAGS += -Wswitch-default\r
 #CC_FLAGS += -Wc++-compat\r