X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fverbose.mk;h=99747ed3fd4f46ad6ef347e0260a2f798c4ae374;hb=44e4c1bee33b54db7abd2d2414b6a4c0d0f37624;hp=da2a21974adde6c53f781ef02403b06243021d7c;hpb=2b9c94e12d0b9aaffc59914fe951fccb269cbb1c;p=openwrt-10.03%2F.git

diff --git a/include/verbose.mk b/include/verbose.mk
index da2a21974..99747ed3f 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
+
+ifeq ($(IS_TTY),1)
+  _Y:="\\033[33m" # yellow
+  _N:="\\033[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