X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cb779e3d7d32d7c43e0a45bb526de0a04135b0c7..44f348e7ffdcd899d87a0ae4a8aacabf67672e9f:/LUFA/makefile

diff --git a/LUFA/makefile b/LUFA/makefile
index ac5ab1afd..b9380f4aa 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2010.
+#     Copyright (C) Dean Camera, 2011.
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
@@ -12,66 +12,93 @@
 # 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_ROOT_PATH = .
+   ARCH = {AVR8,UC3,XMEGA}
 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/Device.c             \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Endpoint.c           \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Host.c               \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Pipe.c               \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/USBController.c      \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/USBInterrupt.c       \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/ConfigDescriptor.c  \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/DeviceStandardReq.c \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/Events.c            \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/EndpointStream.c    \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/HostStandardReq.c   \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/HighLevel/PipeStream.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_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_SCHEDULER    = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.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/$(ARCH)/EndpointStream_$(ARCH).c  \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/PipeStream_$(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/HostStandardReq.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/AudioClassDevice.c        \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c          \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c          \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c  \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c         \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c        \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c            \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c              \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c              \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c      \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c             \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c          \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c            \
+                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c
+LUFA_SRC_TEMPERATURE   = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.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
 
 
 # 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_ALL_FILES = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)       \
-                        $(LUFA_SRC_TEMPERATURE) $(LUFA_SRC_SERIAL) \
-                        $(LUFA_SRC_SERIALSTREAM) $(LUFA_SRC_TWI)   \
-                        $(LUFA_SRC_SCHEDULER)
+   LUFA_VERSION_NUM    = $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)
+
+   LUFA_SRC_ALL_FILES  = $(LUFA_SRC_USB)            \
+                         $(LUFA_SRC_USBCLASS)       \
+                         $(LUFA_SRC_TEMPERATURE)    \
+                         $(LUFA_SRC_SERIAL)         \
+                         $(LUFA_SRC_TWI)
+
+   EXCLUDE_FROM_EXPORT = Documentation DoxygenPages CodeTemplates *.conf *.tar *.o *.lss *.lst *.hex *.elf *.bin
 
    all:
 
    clean:
 	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
+	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)
 
    clean_list:
 
    doxygen:
-	@echo Generating Library Documentation...
-	( cat Doxygen.conf ; echo "PROJECT_NUMBER=`grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2`" ) | doxygen -
+	@echo Generating LUFA Library Documentation...
+
+	@if ( ( cat Doxygen.conf ; echo "PROJECT_NUMBER=$(LUFA_VERSION_NUM)" ) | doxygen - 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then \
+	  exit 1; \
+	fi;
+
 	@echo Documentation Generation Complete.
 
    clean_doxygen:
 	rm -rf Documentation
 
-   .PHONY: all clean clean_list doxygen clean_doxygen
+   checksource:
+   
+   export_tar:
+	@echo Exporting LUFA library to a TAR archive...
+	@tar -cf LUFA_$(LUFA_VERSION_NUM).tar --directory=. $(EXCLUDE_FROM_EXPORT:%=--exclude=%) *
+	@tar -cf LUFA_$(LUFA_VERSION_NUM)_Code_Templates.tar CodeTemplates
+	@echo Export LUFA_$(LUFA_VERSION_NUM).tar complete.
+
+   version:
+	@echo "LUFA $(LUFA_VERSION_NUM)"
+
+   .PHONY: all clean clean_list doxygen clean_doxygen checksource export_tar version
 endif