Change over instances of "make" in the makefiles to "$(MAKE)" to allow for the make...

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

diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile
index ac834b0..b6f53ad 100644 (file)
--- a/Projects/Benito/makefile
+++ b/Projects/Benito/makefile
@@ -60,13 +60,13 @@
 \r
 \r
 # MCU name\r
 \r
 \r
 # MCU name\r

-MCU = at90usb162\r
+MCU = atmega32u2\r

 \r
 \r
 \r
 \r

-# Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, NONE for projects not requiring\r

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

-BOARD  = USER\r
+BOARD  = BENITO\r

 \r
 \r
 # Processor frequency.\r
 \r
 \r
 # Processor frequency.\r


@@ -80,7 +80,7 @@ BOARD  = USER
 #     does not *change* the processor frequency - it should merely be updated to\r
 #     reflect the processor speed set externally so that the code can use accurate\r
 #     software delays.\r
 #     does not *change* the processor frequency - it should merely be updated to\r
 #     reflect the processor speed set externally so that the code can use accurate\r
 #     software delays.\r

-F_CPU = 8000000\r
+F_CPU = 16000000\r

 \r
 \r
 # Input clock frequency.\r
 \r
 \r
 # Input clock frequency.\r


@@ -133,10 +133,10 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r

+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/USBInterrupt.c       \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r

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

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

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

          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c            \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.c              \\r
 \r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c            \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.c              \\r
 \r


@@ -506,12 +506,12 @@ sizeafter:
        2>/dev/null; echo; fi\r
 \r
 $(LUFA_PATH)/LUFA/LUFA_Events.lst:\r
        2>/dev/null; echo; fi\r
 \r
 $(LUFA_PATH)/LUFA/LUFA_Events.lst:\r

-       @make -C $(LUFA_PATH)/LUFA/ LUFA_Events.lst\r
+       @$(MAKE) -C $(LUFA_PATH)/LUFA/ LUFA_Events.lst\r

 \r
 checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst\r
        @echo\r
        @echo Checking for invalid events...\r
 \r
 checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst\r
        @echo\r
        @echo Checking for invalid events...\r

-       @$(shell) avr-nm $(TARGET).elf | sed -n -e 's/^.*EVENT_/EVENT_/p' | \\r
+       @$(shell) avr-nm $(OBJ) | sed -n -e 's/^.*EVENT_/EVENT_/p' | \\r

                         grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true\r
        @sed -n -e 's/^/  WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp\r
        @if test -s InvalidEvents.tmp; then exit 1; fi\r
                         grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true\r
        @sed -n -e 's/^/  WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp\r
        @if test -s InvalidEvents.tmp; then exit 1; fi\r