X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2b9c94e12d0b9aaffc59914fe951fccb269cbb1c..defb257e7e48cce48fffc86fe3ffa4c1354eae48:/include/verbose.mk diff --git a/include/verbose.mk b/include/verbose.mk index da2a21974..34568a31f 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -6,13 +6,21 @@ # # $Id:$ -NO_TRACE_MAKE:=$(MAKE) V=99 +ifeq ($(NO_TRACE_MAKE),) +NO_TRACE_MAKE := $(MAKE) V=99 +export NO_TRACE_MAKE +endif ifndef KBUILD_VERBOSE - KBUILD_VERBOSE=0 - ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE=$(V) - endif + KBUILD_VERBOSE:=0 +endif +ifeq ("$(origin V)", "command line") + KBUILD_VERBOSE:=$(V) +endif + +ifneq ($(shell tty -s <&3 || echo x),x) + _Y:="\\33[33m"# yellow + _N:="\\33[m"# normal endif ifneq ($(KBUILD_VERBOSE),99) @@ -21,17 +29,15 @@ ifneq ($(KBUILD_VERBOSE),99) trace: FORCE @[ -f "$(MAKECMDGOALS)" ] || { \ [ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \ - echo -e "\33[33mmake[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)\33[m" >&3; \ + echo -e "$(_Y)make[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)$(_N)" >&3; \ } else export QUIET:=1 ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif - MAKE:=cmd() { $(MAKE) $$* || { echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; } } 3>&1 4>&2; cmd + MAKE:=cmd() { $(MAKE) $$* || { echo "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 - NO_TRACE_MAKE:=$(MAKE) endif