X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fverbose.mk;h=b4242f212acc512c4d66533932bf86838f374eab;hb=92f1e1a003936d1538258fb7c647e5bf7c8151ca;hp=98dfd5632b6292ded3459283c7a344f0fa149e6a;hpb=02cdebbb91a33d8e24da1c94a9d93ac39be168a7;p=openwrt-10.03%2F.git

diff --git a/include/verbose.mk b/include/verbose.mk
index 98dfd5632..b4242f212 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
+
+ifeq ($(IS_TTY),1)
+  _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:=3>&1 4>&2 $(MAKE)
+    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)