From: Mike Baker <mbm@openwrt.org>
Date: Fri, 23 Jun 2006 21:47:24 +0000 (+0000)
Subject: switch on new verbose system
X-Git-Tag: reboot~30718^2~475
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1ef7c9e055a572539e5e7ada6f69a89a3b51fcbe;p=openwrt%2Fstaging%2Fblogic.git

switch on new verbose system

SVN-Revision: 4064
---

diff --git a/openwrt/Makefile b/openwrt/Makefile
index faeecaa4881e..a554a1d867fd 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -26,6 +26,7 @@ RELEASE:=Kamikaze
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
+include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
diff --git a/openwrt/include/image.mk b/openwrt/include/image.mk
index bf80e2799023..ca0d688f170f 100644
--- a/openwrt/include/image.mk
+++ b/openwrt/include/image.mk
@@ -1,5 +1,3 @@
-include $(TOPDIR)/rules.mk
-
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
 ifneq ($(CONFIG_BIG_ENDIAN),y)
diff --git a/openwrt/include/verbose.mk b/openwrt/include/verbose.mk
index 77a877efe3c4..31e0cea1b310 100644
--- a/openwrt/include/verbose.mk
+++ b/openwrt/include/verbose.mk
@@ -1,14 +1,19 @@
 # OpenWrt.org 2006
 # $Id:$
 
-ifeq ($(DUMP),)
-  ifndef KBUILD_VERBOSE
-    KBUILD_VERBOSE=0
-    ifeq ("$(origin V)", "command line")
-      KBUILD_VERBOSE=$(V)
-    endif
+ifndef KBUILD_VERBOSE
+  ifeq ($(DUMP),)
+    KBUILD_VERBOSE=1
+  else
+    KBUILD_VERBOSE=99
+  endif
+  ifeq ("$(origin V)", "command line")
+    KBUILD_VERBOSE=$(V)
   endif
+endif
+
 
+ifneq ($(KBUILD_VERBOSE),99)
   ifeq ($(QUIET),1)
     $(MAKECMDGOALS): trace
     trace: FORCE
@@ -18,6 +23,9 @@ ifeq ($(DUMP),)
 	}
   else
     export QUIET:=1
+    ifeq ($(KBUILD_VERBOSE),0)
+      MAKE:=&>/dev/null $(MAKE)
+    endif
     MAKE:=3>&1 4>&2 $(MAKE)
   endif
 
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index e947bcfaeaa7..4b924a390c01 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -17,11 +17,9 @@ $(STAMP_DIR) $(TARGET_DIR):
 	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-compile: $(STAMP_DIR) $(TARGET_DIR)
-	@echo "-> make $@"
 	$(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-install: $(STAMP_DIR) $(TARGET_DIR)
-	@echo "-> make $@"
 	$(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)
diff --git a/openwrt/rules.mk b/openwrt/rules.mk
index d762ae79ed4c..42aedcfe542a 100644
--- a/openwrt/rules.mk
+++ b/openwrt/rules.mk
@@ -1,4 +1,5 @@
 -include $(TOPDIR)/.config
+include $(TOPDIR)/include/verbose.mk
 
 export SHELL=/bin/bash