X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/389529fe3599b90544f09cdae2d6318eefbe2352..7ea7d2fde2a5ea60cd4d68b2853ac5bb11ad6ff2:/include/verbose.mk diff --git a/include/verbose.mk b/include/verbose.mk index f18e9a2c7..fed83d6fb 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -21,15 +21,15 @@ ifeq ("$(origin V)", "command line") endif ifeq ($(IS_TTY),1) - _Y:="\\033[33m" # yellow - _N:="\\033[m" #normal + _Y:=\\033[33m + _N:=\\033[m endif -define MESSAGE - echo -e "$(_Y)$(1)$(_N)" >&3 -endef - ifneq ($(KBUILD_VERBOSE),99) + define MESSAGE + printf "$(_Y)%s$(_N)\n" "$(1)" >&3 + endef + ifeq ($(QUIET),1) ifneq ($(CURDIR),$(TOPDIR)) _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) @@ -37,15 +37,19 @@ 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)); \ )) else ifeq ($(KBUILD_VERBOSE),0) - MAKE:=&>/dev/null $(MAKE) + MAKE:=>/dev/null 2>&1 $(MAKE) endif export QUIET:=1 - MAKE:=cmd() { $(MAKE) $$* || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4>&2; cmd + 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 endif .SILENT: $(MAKECMDGOALS) +else + define MESSAGE + printf "%s\n" "$(1)" + endef endif