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

[pub/USBasp.git] / Demos / Device / LowLevel / GenericHID / makefile

diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index 6f5a6e4..ea6a2b0 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287\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
 BOARD  = USBKEY\r
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
+LUFA_OPTS  = -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
@@ -134,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/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/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
@@ -500,16 +499,16 @@ sizeafter:
        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
-       @$(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
-       \r
+\r
 showliboptions:\r
        @echo\r
        @echo ---- Compile Time Library Options ----\r