[brcm63xx] add support for 2.6.33

[openwrt.git] / include / verbose.mk

diff --git a/include/verbose.mk b/include/verbose.mk
index 1ef403c..9fe27ce 100644 (file)
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -1,33 +1,58 @@
-# 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 ($(NO_TRACE_MAKE),)
+NO_TRACE_MAKE := $(MAKE) V=99
+export NO_TRACE_MAKE
+endif

 
 ifndef KBUILD_VERBOSE
 
 ifndef KBUILD_VERBOSE

-  ifeq ($(DUMP),)
-    KBUILD_VERBOSE=0
-  else
-    KBUILD_VERBOSE=99
-  endif
-  ifeq ("$(origin V)", "command line")
-    KBUILD_VERBOSE=$(V)
-  endif
+  KBUILD_VERBOSE:=0
+endif
+ifeq ("$(origin V)", "command line")
+  KBUILD_VERBOSE:=$(V)

 endif
 
 endif
 

+ifeq ($(IS_TTY),1)
+  ifneq ($(strip $(NO_COLOR)),1)
+    _Y:=\\033[33m
+    _N:=\\033[m
+  endif
+endif

 
 ifneq ($(KBUILD_VERBOSE),99)
 
 ifneq ($(KBUILD_VERBOSE),99)

+  define MESSAGE
+       printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+  endef
+

   ifeq ($(QUIET),1)
   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
   else

-    export QUIET:=1

     ifeq ($(KBUILD_VERBOSE),0)
     ifeq ($(KBUILD_VERBOSE),0)

-      MAKE:=&>/dev/null $(MAKE)
+      SILENT:=>/dev/null 2>&1
+    else
+      SILENT:=

     endif
     endif

-    MAKE:=3>&1 4>&2 $(MAKE)
+    export QUIET:=1
+    SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { 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)
   endif
 
   .SILENT: $(MAKECMDGOALS)

+else
+  SUBMAKE=$(MAKE) -w
+  define MESSAGE
+    printf "%s\n" "$(1)"
+  endef

 endif
 endif