X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fverbose.mk;h=6b2d6d044ba2722e1d83eefdeb89105f818ca425;hb=936d19e10c6ee8baef9b2d8f74cfd6eba17a20e3;hp=36002aee990b029c8eb6907e421ef4a4b47a5853;hpb=150b0c9cabdc88d533dde0a019e3edf060dff7d3;p=openwrt-10.03%2F.git diff --git a/include/verbose.mk b/include/verbose.mk index 36002aee9..6b2d6d044 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -18,25 +18,29 @@ 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 +ifeq ($(IS_TTY),1) + _Y:="\\033[33m" # yellow + _N:="\\033[m" #normal endif +define MESSAGE + echo -e "$(_Y)$(1)$(_N)" >&3 +endef + ifneq ($(KBUILD_VERBOSE),99) ifeq ($(QUIET),1) $(MAKECMDGOALS): trace trace: FORCE @[ -f "$(MAKECMDGOALS)" ] || { \ [ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \ - echo -e "$(_Y)make[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)$(_N)" >&3; \ + $(call MESSAGE, "make[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)"); \ } 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)