Fix documentation glitches from the restructuring changes.

[pub/USBasp.git] / LUFA / makefile

diff --git a/LUFA/makefile b/LUFA/makefile
index 2dbecaf..ccc2afd 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -1,9 +1,9 @@
 #
 #             LUFA Library
 #
 #             LUFA Library

-#     Copyright (C) Dean Camera, 2010.
-#              
+#     Copyright (C) Dean Camera, 2011.
+#

 #  dean [at] fourwalledcubicle [dot] com
 #  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.
 #
 
 # Makefile for the LUFA library itself. This can be used to generate the library documentation.


@@ -16,6 +16,11 @@ else
    LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
 endif
 
    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           \
 # Define module source file lists
 LUFA_SRC_USB          = $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Device.c             \
                         $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Endpoint.c           \


@@ -30,7 +35,7 @@ LUFA_SRC_USB          = $(LUFA_ROOT_PATH)/Drivers/USB/LowLevel/Device.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/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_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_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            \


@@ -45,9 +50,8 @@ LUFA_SRC_USBCLASS     = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/Audio.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_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.c
+LUFA_SRC_TWI          = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI.c

 LUFA_SRC_SCHEDULER    = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.c
 
 
 LUFA_SRC_SCHEDULER    = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.c
 
 


@@ -55,14 +59,13 @@ LUFA_SRC_SCHEDULER    = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.c
 ifeq ($(origin LUFA_PATH), undefined)
    LUFA_SRC_ALL_FILES = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)       \
                         $(LUFA_SRC_TEMPERATURE) $(LUFA_SRC_SERIAL) \
 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_SRC_TWI) $(LUFA_SRC_SCHEDULER)

 
    all:
 
    clean:
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
 
    all:
 
    clean:
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)

-       
+

    clean_list:
 
    doxygen:
    clean_list:
 
    doxygen:


@@ -74,4 +77,4 @@ ifeq ($(origin LUFA_PATH), undefined)
        rm -rf Documentation
 
    .PHONY: all clean clean_list doxygen clean_doxygen
        rm -rf Documentation
 
    .PHONY: all clean clean_list doxygen clean_doxygen

-endif
\ No newline at end of file
+endif