X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fverbose.mk;h=34568a31f821f3c8c3b470240ca82971cfcc4511;hb=49b0bca1bafa8443b14ef7a32d1d56d359884a91;hp=c998b3d1c9944740a996bf3b1bc5ebee269564f1;hpb=bc1c3a84e0db1f99afcff8d95d961cd3877a79a3;p=openwrt.git diff --git a/include/verbose.mk b/include/verbose.mk index c998b3d1c9..34568a31f8 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -6,11 +6,21 @@ # # $Id:$ +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) @@ -19,15 +29,14 @@ 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 - NO_TRACE_MAKE:=$(MAKE) V=99 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)