Revert change to assembly file comment syntax; this apparently breaks on the current...

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

diff --git a/LUFA/Build/lufa.atprogram.in b/LUFA/Build/lufa.atprogram.in
index 59fedcd..95b0a97 100644 (file)
--- a/LUFA/Build/lufa.atprogram.in
+++ b/LUFA/Build/lufa.atprogram.in
@@ -6,10 +6,12 @@
 #           www.lufa-lib.org
 #
 
-LUFA_BUILD_MODULES        += ATPROGRAM
-LUFA_BUILD_TARGETS        += atprogram atprogram-ee
-LUFA_BUILD_MANDATORY_VARS += MCU TARGET
-LUFA_BUILD_OPTIONAL_VARS  += ATPROGRAM_PROGRAMMER ATPROGRAM_INTERFACE ATPROGRAM_PORT
+LUFA_BUILD_MODULES         += ATPROGRAM
+LUFA_BUILD_TARGETS         += atprogram atprogram-ee
+LUFA_BUILD_MANDATORY_VARS  += MCU TARGET
+LUFA_BUILD_OPTIONAL_VARS   += ATPROGRAM_PROGRAMMER ATPROGRAM_INTERFACE ATPROGRAM_PORT
+LUFA_BUILD_PROVIDED_VARS   += 
+LUFA_BUILD_PROVIDED_MACROS += 
 
 # -----------------------------------------------------------------------------
 #             LUFA ATPROGRAM Programmer Buildsystem Makefile Module.
@@ -36,24 +38,32 @@ LUFA_BUILD_OPTIONAL_VARS  += ATPROGRAM_PROGRAMMER ATPROGRAM_INTERFACE ATPROGRAM_
 #    ATPROGRAM_INTERFACE       - Name of programming interface to use
 #    ATPROGRAM_PORT            - Name of communication port to use
 #
+# PROVIDED VARIABLES:
+#
+#    (None)
+#
+# PROVIDED MACROS:
+#
+#    (None)
+#
 # -----------------------------------------------------------------------------
 
-# Sanity-check values of mandatory user-supplied variables
-MCU                  ?= $(error Makefile MCU value not set)
-TARGET               ?= $(error Makefile TARGET value not set)
-
-ifeq ($(MCU),)
-   $(error Makefile MCU option cannot be blank)
-endif
-ifeq ($(TARGET),)
-   $(error Makefile TARGET option cannot be blank)
-endif
+ERROR_IF_UNSET   = $(if $(filter undefined, $(origin $(strip $(1)))), $(error Makefile $(strip $(1)) value not set))
+ERROR_IF_EMPTY   = $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $(1)) option cannot be blank))
+ERROR_IF_NONBOOL = $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N))
 
 # Default values of optionally user-supplied variables
 ATPROGRAM_PROGRAMMER ?= jtagice3
 ATPROGRAM_INTERFACE  ?= jtag
 ATPROGRAM_PORT       ?= 
 
+# Sanity check user supplied values
+$(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
+$(call ERROR_IF_EMPTY, MCU)
+$(call ERROR_IF_EMPTY, TARGET)
+$(call ERROR_IF_EMPTY, ATPROGRAM_PROGRAMMER)
+$(call ERROR_IF_EMPTY, ATPROGRAM_INTERFACE)
+
 # Output Messages
 MSG_ATPROGRAM_CMD    := ' [ATPRGRM] :'