Clean up ordering of build system module sanity checks.

diff --git a/LUFA/Build/lufa.avrdude.in b/LUFA/Build/lufa.avrdude.in
index fdc5bc1..9586ae2 100644 (file)
--- a/LUFA/Build/lufa.avrdude.in
+++ b/LUFA/Build/lufa.avrdude.in
@@ -35,17 +35,17 @@ LUFA_BUILD_OPTIONAL_VARS  += AVRDUDE_PROGRAMMER AVRDUDE_PORT AVRDUDE_FLAGS
 #\r
 # -----------------------------------------------------------------------------\r
 \r
 #\r
 # -----------------------------------------------------------------------------\r
 \r

-# Output Messages\r
-MSG_AVRDUDE_CMD     = ' [AVRDUDE] :'\r
+# Sanity-check values of mandatory user-supplied variables\r
+MCU                ?= $(error Makefile MCU value not set.)\r
+TARGET             ?= $(error Makefile TARGET value not set.)\r

 \r
 \r

-# Default values of user-supplied variables\r
+# Default values of optionally user-supplied variables\r

 AVRDUDE_PROGRAMMER ?= jtagicemkii\r
 AVRDUDE_PORT       ?= usb\r
 AVRDUDE_FLAGS      ?= -U flash:w:$(TARGET).hex\r
 \r
 AVRDUDE_PROGRAMMER ?= jtagicemkii\r
 AVRDUDE_PORT       ?= usb\r
 AVRDUDE_FLAGS      ?= -U flash:w:$(TARGET).hex\r
 \r

-# Sanity check the user MCU and TARGET makefile options\r
-MCU                ?= $(error Makefile MCU value not set.)\r
-TARGET             ?= $(error Makefile TARGET value not set.)\r
+# Output Messages\r
+MSG_AVRDUDE_CMD     = ' [AVRDUDE] :'\r

 \r
 program: $(TARGET).hex\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" with settings \"$(AVRDUDE_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r
 \r
 program: $(TARGET).hex\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" with settings \"$(AVRDUDE_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r

diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in
index 6c9133f..e43996d 100644 (file)
--- a/LUFA/Build/lufa.build.in
+++ b/LUFA/Build/lufa.build.in
@@ -53,17 +53,7 @@ LUFA_BUILD_OPTIONAL_VARS  += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_
 #\r
 # -----------------------------------------------------------------------------\r
 \r
 #\r
 # -----------------------------------------------------------------------------\r
 \r

-# Output Messages\r
-MSG_BUILD_BEGIN = Begin compilation of project \"$(TARGET)\"...\r
-MSG_BUILD_END   = Finished building project \"$(TARGET)\"...\r
-MSG_COMPILE_CMD = ' [CC]      :'\r
-MSG_REMOVE_CMD  = ' [RM]      :'\r
-MSG_LINKER_CMD  = ' [LNK]     :'\r
-MSG_SIZE_CMD    = ' [SIZE]    :'\r
-MSG_OBJCPY_CMD  = ' [OBJCPY]  :'\r
-MSG_OBJDMP_CMD  = ' [OBJDMP]  :'\r
-\r
-# Sanity check the user MCU, TARGET, ARCH, SRC, F_USB and LUFA_PATH makefile options\r
+# Sanity-check values of mandatory user-supplied variables\r

 MCU            ?= $(error Makefile MCU value not set.)\r
 TARGET         ?= $(error Makefile TARGET value not set.)\r
 ARCH           ?= $(error Makefile ARCH value not set.)\r
 MCU            ?= $(error Makefile MCU value not set.)\r
 TARGET         ?= $(error Makefile TARGET value not set.)\r
 ARCH           ?= $(error Makefile ARCH value not set.)\r


@@ -71,7 +61,7 @@ SRC            ?= $(error Makefile SRC value not set.)
 F_USB          ?= $(error Makefile F_USB value not set.)\r
 LUFA_PATH      ?= $(error Makefile LUFA_PATH value not set.)\r
 \r
 F_USB          ?= $(error Makefile F_USB value not set.)\r
 LUFA_PATH      ?= $(error Makefile LUFA_PATH value not set.)\r
 \r

-# Default values of user-supplied variables\r
+# Default values of optionally user-supplied variables\r

 BOARD          ?= NONE\r
 OPTIMIZATION   ?= s\r
 F_CPU          ?=\r
 BOARD          ?= NONE\r
 OPTIMIZATION   ?= s\r
 F_CPU          ?=\r


@@ -82,6 +72,16 @@ CPP_FLAGS      ?=
 ASM_FLAGS      ?=\r
 CC_FLAGS       ?=\r
 \r
 ASM_FLAGS      ?=\r
 CC_FLAGS       ?=\r
 \r

+# Output Messages\r
+MSG_BUILD_BEGIN = Begin compilation of project \"$(TARGET)\"...\r
+MSG_BUILD_END   = Finished building project \"$(TARGET)\"...\r
+MSG_COMPILE_CMD = ' [CC]      :'\r
+MSG_REMOVE_CMD  = ' [RM]      :'\r
+MSG_LINKER_CMD  = ' [LNK]     :'\r
+MSG_SIZE_CMD    = ' [SIZE]    :'\r
+MSG_OBJCPY_CMD  = ' [OBJCPY]  :'\r
+MSG_OBJDMP_CMD  = ' [OBJDMP]  :'\r
+\r

 # Convert input source file list to differentiate them by type\r
 C_SOURCE   = $(filter %.c, $(SRC))\r
 CPP_SOURCE = $(filter %.cpp, $(SRC))\r
 # Convert input source file list to differentiate them by type\r
 C_SOURCE   = $(filter %.c, $(SRC))\r
 CPP_SOURCE = $(filter %.cpp, $(SRC))\r

diff --git a/LUFA/Build/lufa.dfu.in b/LUFA/Build/lufa.dfu.in
index 8c478db..c3a102b 100644 (file)
--- a/LUFA/Build/lufa.dfu.in
+++ b/LUFA/Build/lufa.dfu.in
@@ -36,15 +36,15 @@ LUFA_BUILD_OPTIONAL_VARS  +=
 #\r
 # -----------------------------------------------------------------------------\r
 \r
 #\r
 # -----------------------------------------------------------------------------\r
 \r

+# Sanity-check values of mandatory user-supplied variables\r
+MCU            ?= $(error Makefile MCU value not set.)\r
+TARGET         ?= $(error Makefile TARGET value not set.)\r
+\r

 # Output Messages\r
 MSG_COPY_CMD    = ' [CP]      :'\r
 MSG_REMOVE_CMD  = ' [RM]      :'\r
 MSG_DFU_CMD     = ' [DFU]     :'\r
 \r
 # Output Messages\r
 MSG_COPY_CMD    = ' [CP]      :'\r
 MSG_REMOVE_CMD  = ' [RM]      :'\r
 MSG_DFU_CMD     = ' [DFU]     :'\r
 \r

-# Sanity check the user MCU and TARGET makefile options\r
-MCU            ?= $(error Makefile MCU value not set.)\r
-TARGET         ?= $(error Makefile TARGET value not set.)\r
-\r

 flip: $(TARGET).hex\r
        @echo $(MSG_DFU_CMD) Programming FLASH with batchisp using \"$(TARGET).hex\"\r
        batchisp -hardware usb -device $(MCU) -operation erase f\r
 flip: $(TARGET).hex\r
        @echo $(MSG_DFU_CMD) Programming FLASH with batchisp using \"$(TARGET).hex\"\r
        batchisp -hardware usb -device $(MCU) -operation erase f\r

diff --git a/LUFA/Build/lufa.doxygen.in b/LUFA/Build/lufa.doxygen.in
index 039967c..532bde5 100644 (file)
--- a/LUFA/Build/lufa.doxygen.in
+++ b/LUFA/Build/lufa.doxygen.in
@@ -35,14 +35,14 @@ LUFA_BUILD_OPTIONAL_VARS  += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRI
 #                                configuration file\r
 # -----------------------------------------------------------------------------\r
 \r
 #                                configuration file\r
 # -----------------------------------------------------------------------------\r
 \r

-# Output Messages\r
-MSG_DOXYGEN_CMD          = ' [DOXYGEN] :'\r
-\r
-# Default values of user-supplied variables\r
+# Default values of optionally user-supplied variables\r

 DOXYGEN_CONF            ?= Doxygen.conf\r
 DOXYGEN_FAIL_ON_WARNING ?= Y\r
 DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES\r
 \r
 DOXYGEN_CONF            ?= Doxygen.conf\r
 DOXYGEN_FAIL_ON_WARNING ?= Y\r
 DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES\r
 \r

+# Output Messages\r
+MSG_DOXYGEN_CMD          = ' [DOXYGEN] :'\r
+\r

 # Determine Doxygen invocation command\r
 DOXYGEN_CMD = ( cat Doxygen.conf ; $(DOXYGEN_OVERRIDE_PARAMS:%=echo "%";)) | doxygen -\r
 ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)\r
 # Determine Doxygen invocation command\r
 DOXYGEN_CMD = ( cat Doxygen.conf ; $(DOXYGEN_OVERRIDE_PARAMS:%=echo "%";)) | doxygen -\r
 ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)\r

diff --git a/LUFA/Build/lufa.sources.in b/LUFA/Build/lufa.sources.in
index a2e02e9..ee74a48 100644 (file)
--- a/LUFA/Build/lufa.sources.in
+++ b/LUFA/Build/lufa.sources.in
@@ -35,7 +35,7 @@ LUFA_BUILD_OPTIONAL_VARS  +=
 #\r
 # -----------------------------------------------------------------------------\r
 \r
 #\r
 # -----------------------------------------------------------------------------\r
 \r

-# Sanity check the user LUFA_PATH and ARCH makefile options\r
+# Sanity-check values of mandatory user-supplied variables\r

 ARCH           ?= $(error Makefile ARCH value not set.)\r
 LUFA_PATH      ?= $(error Makefile LUFA_PATH value not set.)\r
 \r
 ARCH           ?= $(error Makefile ARCH value not set.)\r
 LUFA_PATH      ?= $(error Makefile LUFA_PATH value not set.)\r
 \r


@@ -43,42 +43,42 @@ LUFA_PATH      ?= $(error Makefile LUFA_PATH value not set.)
 LUFA_ROOT_PATH ?= $(LUFA_PATH)\r
 \r
 # Construct LUFA module source variables\r
 LUFA_ROOT_PATH ?= $(LUFA_PATH)\r
 \r
 # Construct LUFA module source variables\r

-LUFA_SRC_USB           = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c          \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c        \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c            \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c            \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c   \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt_$(ARCH).c    \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/EndpointStream_$(ARCH).c  \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/PipeStream_$(ARCH).c      \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptor.c                \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c               \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                          \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c                 \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c                         \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c\r
-LUFA_SRC_USBCLASS      = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c        \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c          \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c          \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c  \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c         \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c        \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c            \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c              \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c              \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c      \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c             \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c          \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c            \\r
-                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c\r
-LUFA_SRC_TEMPERATURE   = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c\r
-LUFA_SRC_SERIAL        = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c\r
-LUFA_SRC_TWI           = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c\r
+LUFA_SRC_USB         = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c          \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c        \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c            \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c            \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c   \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt_$(ARCH).c    \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/EndpointStream_$(ARCH).c  \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/PipeStream_$(ARCH).c      \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptor.c                \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c               \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                          \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c                 \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c                         \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c\r
+LUFA_SRC_USBCLASS    = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c        \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c          \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c          \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c  \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c         \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c        \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c            \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c              \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c              \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c      \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c             \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c          \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c            \\r
+                       $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c\r
+LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c\r
+LUFA_SRC_SERIAL      = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c\r
+LUFA_SRC_TWI         = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c\r

 \r
 # Build a list of all available module sources\r
 \r
 # Build a list of all available module sources\r

-LUFA_SRC_ALL_FILES     = $(LUFA_SRC_USB)            \\r
-                         $(LUFA_SRC_USBCLASS)       \\r
-                         $(LUFA_SRC_TEMPERATURE)    \\r
-                         $(LUFA_SRC_SERIAL)         \\r
-                         $(LUFA_SRC_TWI)
\ No newline at end of file
+LUFA_SRC_ALL_FILES   = $(LUFA_SRC_USB)            \\r
+                       $(LUFA_SRC_USBCLASS)       \\r
+                       $(LUFA_SRC_TEMPERATURE)    \\r
+                       $(LUFA_SRC_SERIAL)         \\r
+                       $(LUFA_SRC_TWI)
\ No newline at end of file