projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Changed over the AVR8 USB controller interrupt management macros to be inlined functi...
[pub/USBasp.git] / LUFA / makefile
diff --git a/LUFA/makefile b/LUFA/makefile
index 845de4e..ff4dbd9 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -1,9 +1,9 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2010.
-#              
+#     Copyright (C) Dean Camera, 2011.
+#
 #  dean [at] fourwalledcubicle [dot] com
-#      www.fourwalledcubicle.com
+#           www.lufa-lib.org
 #
 
 # Makefile for the LUFA library itself. This can be used to generate the library documentation.
@@ -16,51 +16,56 @@ else
    LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
 endif
 
+# Check to see if the chip architecture has not been defined in the user makefile, set a default architecture if not
+ifeq ($(origin ARCH), undefined)
+   ARCH = AVR8
+endif
+
 # Define module source file lists
-LUFA_SRC_USB          = $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/DevChapter9.c        \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Device.c             \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Endpoint.c           \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Host.c               \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/HostChapter9.c       \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/LowLevel.c           \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Pipe.c               \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/USBInterrupt.c       \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/ConfigDescriptor.c  \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/Events.c            \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/USBTask.c           \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDParser.c
-LUFA_SRC_USBCLASS     = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/Audio.c          \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDC.c            \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HID.c            \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorage.c    \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDI.c           \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDIS.c          \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDC.c              \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HID.c              \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorage.c      \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDI.c             \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Printer.c          \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDIS.c            \
+LUFA_SRC_USB          = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c        \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c      \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c          \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c          \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt_$(ARCH).c  \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptor.c              \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c             \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                        \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/EndpointStream.c                \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c               \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/PipeStream.c                    \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c                       \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c
+LUFA_SRC_USBCLASS     = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/Audio.c                 \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDC.c                   \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HID.c                   \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorage.c           \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDI.c                  \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDIS.c                 \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDC.c                     \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HID.c                     \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorage.c             \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDI.c                    \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Printer.c                 \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDIS.c                   \
                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImage.c
 LUFA_SRC_TEMPERATURE  = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c
-LUFA_SRC_SERIAL       = $(LUFA_ROOT_PATH)/Drivers/Peripheral/Serial.c
-LUFA_SRC_SERIALSTREAM = $(LUFA_ROOT_PATH)/Drivers/Peripheral/SerialStream.c
-LUFA_SRC_TWI          = $(LUFA_ROOT_PATH)/Drivers/Peripheral/TWI.c
+LUFA_SRC_SERIAL       = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c
+LUFA_SRC_TWI          = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c
 LUFA_SRC_SCHEDULER    = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.c
 
 
 # Check to see if the LUFA_PATH variable has not been set (the makefile is not being included from a project makefile)
 ifeq ($(origin LUFA_PATH), undefined)
-   LUFA_SRC_FILES        = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)       \
-                           $(LUFA_SRC_TEMPERATURE) $(LUFA_SRC_SERIAL) \
-                           $(LUFA_SRC_SERIALSTREAM) $(LUFA_SRC_TWI)   \
-                           $(LUFA_SRC_SCHEDULER)
+   LUFA_SRC_ALL_FILES = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)       \
+                        $(LUFA_SRC_TEMPERATURE) $(LUFA_SRC_SERIAL) \
+                        $(LUFA_SRC_TWI) $(LUFA_SRC_SCHEDULER)
 
    all:
 
    clean:
-       rm -f $(LUFA_SRC_FILES:%.c=%.o)
-       
+       rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
+
    clean_list:
 
    doxygen:
@@ -72,4 +77,4 @@ ifeq ($(origin LUFA_PATH), undefined)
        rm -rf Documentation
 
    .PHONY: all clean clean_list doxygen clean_doxygen
-endif
\ No newline at end of file
+endif
USB isp AVR programmer