From 6dc85e40233f1d33af9d2fb80fa97de345f1e162 Mon Sep 17 00:00:00 2001 From: Dean Camera <dean@fourwalledcubicle.com> Date: Sun, 10 Jun 2012 10:31:38 +0000 Subject: [PATCH] Minor build system sanity check fixes. --- LUFA/Build/lufa.build.in | 6 +++--- LUFA/Build/lufa.dfu.in | 2 -- LUFA/Build/lufa.doxygen.in | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in index b1f9efe9c..066986aed 100644 --- a/LUFA/Build/lufa.build.in +++ b/LUFA/Build/lufa.build.in @@ -55,9 +55,9 @@ LUFA_BUILD_OPTIONAL_VARS += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_ # # ----------------------------------------------------------------------------- -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)) +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 BOARD ?= NONE diff --git a/LUFA/Build/lufa.dfu.in b/LUFA/Build/lufa.dfu.in index 9c05bb7c1..f7c1ef705 100644 --- a/LUFA/Build/lufa.dfu.in +++ b/LUFA/Build/lufa.dfu.in @@ -42,8 +42,6 @@ ERROR_IF_NONBOOL = $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(st # Sanity-check values of mandatory user-supplied variables $(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR))) -$(call ERROR_IF_UNSET, MCU) -$(call ERROR_IF_UNSET, TARGET) $(call ERROR_IF_EMPTY, MCU) $(call ERROR_IF_EMPTY, TARGET) diff --git a/LUFA/Build/lufa.doxygen.in b/LUFA/Build/lufa.doxygen.in index 4ec52c8a4..99281a7bb 100644 --- a/LUFA/Build/lufa.doxygen.in +++ b/LUFA/Build/lufa.doxygen.in @@ -46,7 +46,7 @@ DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES HTML_STYLESHEET=$(patsubst %/,%,$(LUFA_PATH # Sanity check user supplied values $(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR))) -$(call ERROR_IF_EMPTY, LUFA_PATH) +$(call ERROR_IF_EMPTY, DOXYGEN_CONF) $(call ERROR_IF_EMPTY, LUFA_PATH) $(call ERROR_IF_NONBOOL, DOXYGEN_FAIL_ON_WARNING) -- GitLab