add fixes for the pptp network scripts

[openwrt.git] / include / verbose.mk

diff --git a/include/verbose.mk b/include/verbose.mk
index 58a20a2..36002ae 100644 (file)
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -6,10 +6,21 @@
 #
 # $Id:$
 
 #
 # $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
 
 ifndef KBUILD_VERBOSE

-  KBUILD_VERBOSE=$(V)
+  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)
 endif
 
 ifneq ($(KBUILD_VERBOSE),99)


@@ -18,7 +29,7 @@ ifneq ($(KBUILD_VERBOSE),99)
     trace: FORCE
        @[ -f "$(MAKECMDGOALS)" ] || { \
                [ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \
     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
        }
   else
     export QUIET:=1


@@ -29,6 +40,4 @@ ifneq ($(KBUILD_VERBOSE),99)
   endif
 
   .SILENT: $(MAKECMDGOALS)
   endif
 
   .SILENT: $(MAKECMDGOALS)

-else
-   NO_TRACE_MAKE:=$(MAKE)

 endif
 endif