remove uneeded stuff after python changes in [8639]

[openwrt.git] / include / verbose.mk

diff --git a/include/verbose.mk b/include/verbose.mk
index 34568a3..4abdf8d 100644 (file)
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -8,7 +8,9 @@
 
 ifeq ($(NO_TRACE_MAKE),)
 NO_TRACE_MAKE := $(MAKE) V=99
 
 ifeq ($(NO_TRACE_MAKE),)
 NO_TRACE_MAKE := $(MAKE) V=99

+SUBMAKE := $(MAKE)

 export NO_TRACE_MAKE
 export NO_TRACE_MAKE

+export SUBMAKE

 endif
 
 ifndef KBUILD_VERBOSE
 endif
 
 ifndef KBUILD_VERBOSE


@@ -18,25 +20,31 @@ ifeq ("$(origin V)", "command line")
   KBUILD_VERBOSE:=$(V)
 endif
 
   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
 
 endif
 

+define MESSAGE
+       /bin/echo -e "$(_Y)$(1)$(_N)" >&3
+endef
+

 ifneq ($(KBUILD_VERBOSE),99)
   ifeq ($(QUIET),1)
 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; \
-       }
+    ifneq ($(CURDIR),$(TOPDIR))
+      _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
+    else
+      _DIR:=
+    endif
+    _NULL:=$(if $(MAKECMDGOALS),$(shell \
+               $(call MESSAGE, "make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)"); \
+    ))

   else
   else

-    export QUIET:=1

     ifeq ($(KBUILD_VERBOSE),0)
       MAKE:=&>/dev/null $(MAKE)
     endif
     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"; false; } } 3>&1 4>&2; cmd
+    export QUIET:=1
+    MAKE:=cmd() { $(MAKE) -s $$* || {  echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4>&2; cmd

   endif
 
   .SILENT: $(MAKECMDGOALS)
   endif
 
   .SILENT: $(MAKECMDGOALS)