Fix makefiles -- the auto-addition of -D switches to each LUFA compile time option...

[pub/USBasp.git] / Projects / Magstripe / makefile

diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 5d474cd..e9cea8d 100644 (file)
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287
 
 
 MCU = at90usb1287
 
 

-# Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring
+# Target board (see library "Board Types" documentation, USER or blank for projects not requiring

 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
 # "Board" inside the application directory.
 BOARD  = USER
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
 # "Board" inside the application directory.
 BOARD  = USER


@@ -122,11 +122,18 @@ OBJDIR = .
 LUFA_PATH = ../..
 
 
 LUFA_PATH = ../..
 
 

+# LUFA library compile-time options
+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += -D USB_DEVICE_ONLY
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+
+

 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c                                                 \
          Descriptors.c                                               \
 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c                                                 \
          Descriptors.c                                               \

-         CircularBitBuffer.c                                         \
-         $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+         Lib/CircularBitBuffer.c                                     \

          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \


@@ -134,11 +141,11 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \

-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \

          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \

-         $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-         $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \

 
 
 # List C++ source files here. (C dependencies are automatically generated.)
 
 
 # List C++ source files here. (C dependencies are automatically generated.)


@@ -184,10 +191,7 @@ CSTANDARD = -std=gnu99
 
 
 # Place -D or -U options here for C sources
 
 
 # Place -D or -U options here for C sources

-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY
-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)

 CDEFS += -DMAG_T1_CLOCK="(1 << 0)"
 CDEFS += -DMAG_T1_DATA="(1 << 1)"
 CDEFS += -DMAG_T2_CLOCK="(1 << 2)"
 CDEFS += -DMAG_T1_CLOCK="(1 << 0)"
 CDEFS += -DMAG_T1_DATA="(1 << 1)"
 CDEFS += -DMAG_T2_CLOCK="(1 << 2)"


@@ -514,7 +518,7 @@ sizeafter:
 checkhooks: build
        @echo
        @echo ------- Unhooked LUFA Events -------
 checkhooks: build
        @echo
        @echo ------- Unhooked LUFA Events -------

-       @$(shell) (grep -s '^Event.*LUFA/.*\\.o' $(TARGET).map | \
+       @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \
                           echo "(None)"
        @echo ------------------------------------
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \
                           echo "(None)"
        @echo ------------------------------------