Remove any variables in the optional build variable list that are marked as mandatory...

diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in
index e76f5c3..d1b82d8 100644 (file)
--- a/LUFA/Build/lufa.build.in
+++ b/LUFA/Build/lufa.build.in
@@ -92,16 +92,16 @@ OBJECT_FILES = $(filter %.o, $(C_SOURCE:%.c=%.o) $(CPP_SOURCE:%.cpp=%.o) $(ASM_S
 \r
 # Create a list of flags to pass to the compiler\r
 ifeq ($(ARCH), AVR8)\r
 \r
 # Create a list of flags to pass to the compiler\r
 ifeq ($(ARCH), AVR8)\r

- CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct\r
- CROSS     = avr-\r
+   CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct\r
+   CROSS     = avr-\r

 else ifeq ($(ARCH), XMEGA)\r
 else ifeq ($(ARCH), XMEGA)\r

- CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct\r
- CROSS     = avr-\r
+   CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct\r
+   CROSS     = avr-\r

 else ifeq ($(ARCH), UC3)\r
 else ifeq ($(ARCH), UC3)\r

- CC_FLAGS += -mpart=$(MCU) -g3 -masm-addr-pseudos\r
- CROSS     = avr32-\r
+   CC_FLAGS += -mpart=$(MCU) -g3 -masm-addr-pseudos\r
+   CROSS     = avr32-\r

 else\r
 else\r

-  $(error Unsupported architecture.)\r
+    $(error Unsupported architecture.)\r

 endif\r
 CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections\r
 CC_FLAGS += -I. -I$(patsubst %/,%,$(LUFA_PATH))/..\r
 endif\r
 CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections\r
 CC_FLAGS += -I. -I$(patsubst %/,%,$(LUFA_PATH))/..\r

diff --git a/LUFA/Build/lufa.core.in b/LUFA/Build/lufa.core.in
index e4cc364..bc07a94 100644 (file)
--- a/LUFA/Build/lufa.core.in
+++ b/LUFA/Build/lufa.core.in
@@ -76,7 +76,7 @@ help: info
        @echo "                                                                   "\r
        @echo "  Optional variables required by the selected build Modules:       "\r
        @echo "                                                                   "\r
        @echo "                                                                   "\r
        @echo "  Optional variables required by the selected build Modules:       "\r
        @echo "                                                                   "\r

-       @echo "    [" $(sort $(LUFA_BUILD_OPTIONAL_VARS)) "]"\r
+       @echo "    [" $(filter-out $(LUFA_BUILD_MANDATORY_VARS), $(sort $(LUFA_BUILD_OPTIONAL_VARS))) "]"\r

        @echo "                                                                   "\r
        @echo "==================================================================="\r
        @echo "        The LUFA BuildSystem 2.0 - Powered By Unicorns (tm)        "\r
        @echo "                                                                   "\r
        @echo "==================================================================="\r
        @echo "        The LUFA BuildSystem 2.0 - Powered By Unicorns (tm)        "\r


@@ -92,4 +92,4 @@ list_mandatory:
        @echo Mandatory Variables for Included Modules: $(sort $(LUFA_BUILD_MANDATORY_VARS))\r
        \r
 list_optional:\r
        @echo Mandatory Variables for Included Modules: $(sort $(LUFA_BUILD_MANDATORY_VARS))\r
        \r
 list_optional:\r

-       @echo Optional Variables for Included Modules: $(sort $(LUFA_BUILD_OPTIONAL_VARS))\r
+       @echo Optional Variables for Included Modules: $(filter-out $(LUFA_BUILD_MANDATORY_VARS), $(sort $(LUFA_BUILD_OPTIONAL_VARS)))\r

diff --git a/LUFA/Build/lufa.doxygen.in b/LUFA/Build/lufa.doxygen.in
index 13055fc..f1b9a9d 100644 (file)
--- a/LUFA/Build/lufa.doxygen.in
+++ b/LUFA/Build/lufa.doxygen.in
@@ -8,7 +8,7 @@
 \r
 LUFA_BUILD_MODULES        += DOXYGEN\r
 LUFA_BUILD_TARGETS        += doxygen\r
 \r
 LUFA_BUILD_MODULES        += DOXYGEN\r
 LUFA_BUILD_TARGETS        += doxygen\r

-LUFA_BUILD_MANDATORY_VARS += \r
+LUFA_BUILD_MANDATORY_VARS += LUFA_PATH\r

 LUFA_BUILD_OPTIONAL_VARS  += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRIDE_PARAMS\r
 \r
 # -----------------------------------------------------------------------------\r
 LUFA_BUILD_OPTIONAL_VARS  += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRIDE_PARAMS\r
 \r
 # -----------------------------------------------------------------------------\r


@@ -24,7 +24,7 @@ LUFA_BUILD_OPTIONAL_VARS  += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRI
 #\r
 # MANDATORY PARAMETERS:\r
 #\r
 #\r
 # MANDATORY PARAMETERS:\r
 #\r

-#    (None)\r
+#    LUFA_PATH                 - Path to the LUFA library core\r

 #\r
 # OPTIONAL PARAMETERS:\r
 #\r
 #\r
 # OPTIONAL PARAMETERS:\r
 #\r


@@ -35,20 +35,23 @@ LUFA_BUILD_OPTIONAL_VARS  += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRI
 #                                configuration file\r
 # -----------------------------------------------------------------------------\r
 \r
 #                                configuration file\r
 # -----------------------------------------------------------------------------\r
 \r

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

 # Default values of optionally user-supplied variables\r
 DOXYGEN_CONF            ?= Doxygen.conf\r
 DOXYGEN_FAIL_ON_WARNING ?= Y\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
+DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES HTML_STYLESHEET=$(patsubst %/,%,$(LUFA_PATH))/DoxygenPages/Style/Style.css\r

 \r
 # Output Messages\r
 MSG_DOXYGEN_CMD          = ' [DOXYGEN] :'\r
 \r
 # Determine Doxygen invocation command\r
 \r
 # Output Messages\r
 MSG_DOXYGEN_CMD          = ' [DOXYGEN] :'\r
 \r
 # Determine Doxygen invocation command\r

-BASE_DOXYGEN_CMD = ( cat Doxygen.conf ; $(DOXYGEN_OVERRIDE_PARAMS:%=echo "%") ) | doxygen -\r
+BASE_DOXYGEN_CMD = ( cat Doxygen.conf $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen -\r

 ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)\r
 ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)\r

-    DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;\r
+   DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;\r

 else\r
 else\r

-    DOXYGEN_CMD = $(BASE_DOXYGEN_CMD)\r
+   DOXYGEN_CMD = $(BASE_DOXYGEN_CMD)\r

 endif\r
 \r
 doxygen:\r
 endif\r
 \r
 doxygen:\r