switch on new verbose system

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4064 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Makefile b/Makefile
index faeecaa..a554a1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ RELEASE:=Kamikaze
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR

+include $(TOPDIR)/include/verbose.mk

 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)

diff --git a/include/image.mk b/include/image.mk
index bf80e27..ca0d688 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -1,5 +1,3 @@
-include $(TOPDIR)/rules.mk
-

 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
 ifneq ($(CONFIG_BIG_ENDIAN),y)
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
 ifneq ($(CONFIG_BIG_ENDIAN),y)

diff --git a/include/verbose.mk b/include/verbose.mk
index 77a877e..31e0cea 100644 (file)
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -1,14 +1,19 @@
 # OpenWrt.org 2006
 # $Id:$
 
 # 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

+endif
+

 
 

+ifneq ($(KBUILD_VERBOSE),99)

   ifeq ($(QUIET),1)
     $(MAKECMDGOALS): trace
     trace: FORCE
   ifeq ($(QUIET),1)
     $(MAKECMDGOALS): trace
     trace: FORCE


@@ -18,6 +23,9 @@ ifeq ($(DUMP),)
        }
   else
     export QUIET:=1
        }
   else
     export QUIET:=1

+    ifeq ($(KBUILD_VERBOSE),0)
+      MAKE:=&>/dev/null $(MAKE)
+    endif

     MAKE:=3>&1 4>&2 $(MAKE)
   endif
 
     MAKE:=3>&1 4>&2 $(MAKE)
   endif
 

diff --git a/package/Makefile b/package/Makefile
index e947bcf..4b924a3 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -17,11 +17,9 @@ $(STAMP_DIR) $(TARGET_DIR):
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-compile: $(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)
        $(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)
        $(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)

diff --git a/rules.mk b/rules.mk
index d762ae7..42aedcf 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,5 @@
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/.config

+include $(TOPDIR)/include/verbose.mk

 
 export SHELL=/bin/bash
 
 
 export SHELL=/bin/bash