X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fverbose.mk;h=620c2b3f009a3849a5175b0d2fec7c01fc34aa3e;hb=37702eb46e55f5220ee20970acbfdcb58df61ec4;hp=36e59904ecff5fee634ad82e36104d80f61d6162;hpb=07778fef35c82fd101ae191b4b447f43e9b75389;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/include/verbose.mk b/include/verbose.mk
index 36e59904ec..620c2b3f00 100644
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -4,13 +4,10 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id:$
 
 ifeq ($(NO_TRACE_MAKE),)
 NO_TRACE_MAKE := $(MAKE) V=99
-SUBMAKE := $(MAKE)
 export NO_TRACE_MAKE
-export SUBMAKE
 endif
 
 ifndef KBUILD_VERBOSE
@@ -25,11 +22,11 @@ ifeq ($(IS_TTY),1)
   _N:=\\033[m
 endif
 
-define MESSAGE
-	printf "$(_Y)%s$(_N)\n" "$(1)" >&3
-endef
-
 ifneq ($(KBUILD_VERBOSE),99)
+  define MESSAGE
+	printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+  endef
+
   ifeq ($(QUIET),1)
     ifneq ($(CURDIR),$(TOPDIR))
       _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
@@ -39,13 +36,21 @@ ifneq ($(KBUILD_VERBOSE),99)
     _NULL:=$(if $(MAKECMDGOALS),$(shell \
 		$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
     ))
+    SUBMAKE=$(MAKE)
   else
     ifeq ($(KBUILD_VERBOSE),0)
-      MAKE:=>/dev/null 2>&1 $(MAKE)
+      SILENT:=>/dev/null 2>&1
+    else
+      SILENT:=
     endif
     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
+    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