X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5779a7549f48314ede29d3d6bd1f796f8398c625..bc5689e8e70c3f6b94562430eba3601007488f58:/include/verbose.mk?ds=sidebyside diff --git a/include/verbose.mk b/include/verbose.mk index 620dbbd0f..9fe27ced5 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -4,13 +4,10 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id:$ ifeq ($(NO_TRACE_MAKE),) NO_TRACE_MAKE := $(MAKE) V=99 -SUBMAKE := $(MAKE) export NO_TRACE_MAKE -export SUBMAKE endif ifndef KBUILD_VERBOSE @@ -21,15 +18,17 @@ ifeq ("$(origin V)", "command line") endif ifeq ($(IS_TTY),1) - _Y:="\\033[33m" # yellow - _N:="\\033[m" #normal + ifneq ($(strip $(NO_COLOR)),1) + _Y:=\\033[33m + _N:=\\033[m + endif endif -define MESSAGE - /bin/echo -e "$(_Y)$(1)$(_N)" >&3 -endef - ifneq ($(KBUILD_VERBOSE),99) + define MESSAGE + printf "$(_Y)%s$(_N)\n" "$(1)" >&8 + endef + ifeq ($(QUIET),1) ifneq ($(CURDIR),$(TOPDIR)) _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) @@ -37,15 +36,23 @@ ifneq ($(KBUILD_VERBOSE),99) _DIR:= endif _NULL:=$(if $(MAKECMDGOALS),$(shell \ - $(call MESSAGE, "make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)"); \ + $(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \ )) + SUBMAKE=$(MAKE) else ifeq ($(KBUILD_VERBOSE),0) - MAKE:=>/dev/null 2>&1 $(MAKE) + SILENT:=>/dev/null 2>&1 + else + SILENT:= endif export QUIET:=1 - MAKE:=cmd() { $(MAKE) -s $$* || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4>&2; cmd + SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 8>&1 9>&2; cmd endif .SILENT: $(MAKECMDGOALS) +else + SUBMAKE=$(MAKE) -w + define MESSAGE + printf "%s\n" "$(1)" + endef endif