X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5e79d66953f0bef849cafba752fca2fdb8fcdabc..d0c10785e702f0e56029aee4c4f8f9bfcf03a5e9:/include/verbose.mk

diff --git a/include/verbose.mk b/include/verbose.mk
index 77a877efe..620c2b3f0 100644
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -1,25 +1,56 @@
-# OpenWrt.org 2006
-# $Id:$
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
-ifeq ($(DUMP),)
-  ifndef KBUILD_VERBOSE
-    KBUILD_VERBOSE=0
-    ifeq ("$(origin V)", "command line")
-      KBUILD_VERBOSE=$(V)
-    endif
-  endif
+ifeq ($(NO_TRACE_MAKE),)
+NO_TRACE_MAKE := $(MAKE) V=99
+export NO_TRACE_MAKE
+endif
+
+ifndef KBUILD_VERBOSE
+  KBUILD_VERBOSE:=0
+endif
+ifeq ("$(origin V)", "command line")
+  KBUILD_VERBOSE:=$(V)
+endif
+
+ifeq ($(IS_TTY),1)
+  _Y:=\\033[33m
+  _N:=\\033[m
+endif
+
+ifneq ($(KBUILD_VERBOSE),99)
+  define MESSAGE
+	printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+  endef
 
   ifeq ($(QUIET),1)
-    $(MAKECMDGOALS): trace
-    trace: FORCE
-	@[ -f "$(MAKECMDGOALS)" ] || { \
-		[ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \
-		echo -e "\33[33mmake[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)\33[m" >&3; \
-	}
+    ifneq ($(CURDIR),$(TOPDIR))
+      _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
+    else
+      _DIR:=
+    endif
+    _NULL:=$(if $(MAKECMDGOALS),$(shell \
+		$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
+    ))
+    SUBMAKE=$(MAKE)
   else
+    ifeq ($(KBUILD_VERBOSE),0)
+      SILENT:=>/dev/null 2>&1
+    else
+      SILENT:=
+    endif
     export QUIET:=1
-    MAKE:=3>&1 4>&2 $(MAKE)
+    SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 8>&1 9>&2; cmd
   endif
 
   .SILENT: $(MAKECMDGOALS)
+else
+  SUBMAKE=$(MAKE)
+  define MESSAGE
+    printf "%s\n" "$(1)"
+  endef
 endif