Factor out all the ISP related code into a seperate ISPProtocol set of files in the...

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

diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index 35e1e42..bc63e95 100644 (file)
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r


@@ -131,6 +130,7 @@ SRC = $(TARGET).c                                                 \
       Lib/V2Protocol.c                                            \\r
       Lib/V2ProtocolParams.c                                      \\r
       Lib/V2ProtocolTarget.c                                      \\r
       Lib/V2Protocol.c                                            \\r
       Lib/V2ProtocolParams.c                                      \\r
       Lib/V2ProtocolTarget.c                                      \\r

+      Lib/ISPProtocol.c                                           \\r

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


@@ -512,7 +512,7 @@ $(LUFA_PATH)/LUFA/LUFA_Events.lst:
 checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst\r
        @echo\r
        @echo Checking for invalid events...\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