1.1 --- a/common/makefiles/MakeHelpers.gmk Tue Apr 09 09:42:20 2013 +0200
1.2 +++ b/common/makefiles/MakeHelpers.gmk Tue Apr 09 09:45:48 2013 +0200
1.3 @@ -184,26 +184,34 @@
1.4 LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1))
1.5 # We might have ended up with a leading comma. Remove it
1.6 LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2)))
1.7 - override LOG:=$$(LOG_STRIPPED3)
1.8 + LOG_LEVEL:=$$(LOG_STRIPPED3)
1.9 + else
1.10 + LOG_LEVEL:=$$(LOG)
1.11 endif
1.12
1.13 - ifeq ($$(LOG),)
1.14 + ifeq ($$(LOG_LEVEL),)
1.15 # Set LOG to "warn" as default if not set (and no VERBOSE given)
1.16 - override LOG=warn
1.17 + override LOG_LEVEL=warn
1.18 endif
1.19 - ifeq ($$(LOG),warn)
1.20 + ifeq ($$(LOG_LEVEL),warn)
1.21 VERBOSE=-s
1.22 - else ifeq ($$(LOG),info)
1.23 + else ifeq ($$(LOG_LEVEL),info)
1.24 VERBOSE=-s
1.25 - else ifeq ($$(LOG),debug)
1.26 + else ifeq ($$(LOG_LEVEL),debug)
1.27 VERBOSE=
1.28 - else ifeq ($$(LOG),trace)
1.29 + else ifeq ($$(LOG_LEVEL),trace)
1.30 VERBOSE=
1.31 else
1.32 $$(info Error: LOG must be one of: warn, info, debug or trace.)
1.33 $$(eval $$(call FatalError))
1.34 endif
1.35 else
1.36 + # Provide resonable interpretations of LOG_LEVEL if VERBOSE is given.
1.37 + ifeq ($(VERBOSE),)
1.38 + LOG_LEVEL:=debug
1.39 + else
1.40 + LOG_LEVEL:=warn
1.41 + endif
1.42 ifneq ($$(LOG),)
1.43 # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves,
1.44 # but complain if this is the top-level make call.
