Clean up CORE build system module, use simple rather than recursive make variables...

[pub/lufa.git] / LUFA / Build / lufa.core.in

diff --git a/LUFA/Build/lufa.core.in b/LUFA/Build/lufa.core.in
index bc07a94..f403b9e 100644 (file)
--- a/LUFA/Build/lufa.core.in
+++ b/LUFA/Build/lufa.core.in
@@ -7,7 +7,7 @@
 #\r
 \r
 LUFA_BUILD_MODULES        += CORE\r
-LUFA_BUILD_TARGETS        += info help list_targets list_modules list_mandatory list_optional \r
+LUFA_BUILD_TARGETS        += help list_targets list_modules list_mandatory list_optional \r
 LUFA_BUILD_MANDATORY_VARS += \r
 LUFA_BUILD_OPTIONAL_VARS  += \r
 \r
@@ -19,7 +19,6 @@ LUFA_BUILD_OPTIONAL_VARS  +=
 # -----------------------------------------------------------------------------\r
 # TARGETS:\r
 #\r
-#    info                      - Build system information\r
 #    help                      - Build system help\r
 #    list_targets              - List all build targets\r
 #    list_modules              - List all build modules\r
@@ -38,14 +37,17 @@ LUFA_BUILD_OPTIONAL_VARS  +=
 #\r
 # -----------------------------------------------------------------------------\r
 \r
-info:\r
+# Build sorted and filtered lists of the included build module data\r
+SORTED_LUFA_BUILD_MODULES  = $(sort $(LUFA_BUILD_MODULES))\r
+SORTED_LUFA_BUILD_TARGETS  = $(sort $(LUFA_BUILD_TARGETS))\r
+SORTED_LUFA_MANDATORY_VARS = $(sort $(LUFA_BUILD_MANDATORY_VARS))\r
+SORTED_LUFA_OPTIONAL_VARS  = $(filter-out $(SORTED_LUFA_MANDATORY_VARS), $(sort $(LUFA_BUILD_OPTIONAL_VARS)))\r
+\r
+help:\r
        @echo "==================================================================="\r
-       @echo "                  LUFA Build System 2.0                            "\r
-       @echo "      (C) Dean Camera { dean @ fourwalledcubicle . com }           "\r
+       @echo "                       LUFA Build System 2.0                       "\r
+       @echo "      (C) Dean Camera, 2012 { dean @ fourwalledcubicle . com }     "\r
        @echo "==================================================================="\r
-\r
-.PHONY: info\r
-help: info\r
        @echo "DESCRIPTION:                                                       "\r
        @echo " This build system is a set of makefile modules for (GNU) Make, to "\r
        @echo " provide a simple system for building LUFA powered applications.   "\r
@@ -61,35 +63,35 @@ help: info
        @echo "==================================================================="\r
        @echo "  Currently used modules in this application:                      "\r
        @echo "                                                                   "\r
-       @echo "    [" $(sort $(LUFA_BUILD_MODULES)) "]"\r
+       @echo "    [" $(SORTED_LUFA_BUILD_MODULES) "]"\r
        @echo "                                                                   "\r
        @echo "                                                                   "\r
        @echo "  Currently available build targets in this application:           "\r
        @echo "                                                                   "\r
-       @echo "    [" $(sort $(LUFA_BUILD_TARGETS)) "]"\r
+       @echo "    [" $(SORTED_LUFA_BUILD_TARGETS) "]"\r
        @echo "                                                                   "\r
        @echo "                                                                   "\r
        @echo "  Mandatory variables required by the selected build Modules:      "\r
        @echo "                                                                   "\r
-       @echo "    [" $(sort $(LUFA_BUILD_MANDATORY_VARS)) "]"\r
+       @echo "    [" $(SORTED_LUFA_MANDATORY_VARS) "]"\r
        @echo "                                                                   "\r
        @echo "                                                                   "\r
        @echo "  Optional variables required by the selected build Modules:       "\r
        @echo "                                                                   "\r
-       @echo "    [" $(filter-out $(LUFA_BUILD_MANDATORY_VARS), $(sort $(LUFA_BUILD_OPTIONAL_VARS))) "]"\r
+       @echo "    [" $(SORTED_LUFA_OPTIONAL_VARS) "]"\r
        @echo "                                                                   "\r
        @echo "==================================================================="\r
        @echo "        The LUFA BuildSystem 2.0 - Powered By Unicorns (tm)        "\r
        @echo "==================================================================="\r
        \r
-list_targets:\r
-       @echo Currently Available Build Targets: $(sort $(LUFA_BUILD_TARGETS))\r
-       \r
 list_modules:\r
-       @echo Currently Build Modules: $(sort $(LUFA_BUILD_MODULES))\r
+       @echo Currently Build Modules: $(SORTED_LUFA_BUILD_MODULES)\r
+\r
+list_targets:\r
+       @echo Currently Available Build Targets: $(SORTED_LUFA_BUILD_TARGETS)   \r
 \r
 list_mandatory:\r
-       @echo Mandatory Variables for Included Modules: $(sort $(LUFA_BUILD_MANDATORY_VARS))\r
+       @echo Mandatory Variables for Included Modules: $(SORTED_LUFA_MANDATORY_VARS)\r
        \r
 list_optional:\r
-       @echo Optional Variables for Included Modules: $(filter-out $(LUFA_BUILD_MANDATORY_VARS), $(sort $(LUFA_BUILD_OPTIONAL_VARS)))\r
+       @echo Optional Variables for Included Modules: $(SORTED_LUFA_OPTIONAL_VARS)\r