summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-23 21:47:24 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-23 21:47:24 +0000
commit242527ccb9da3ac4cfe50969092a739c8b359321 (patch)
treecc874bf88aadf09709a732edc3e8807e5fc60c5b
parent3eb60d771b50f4cf7c4e0d4cf1d60cd557c290a4 (diff)
switch on new verbose system
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4064 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile1
-rw-r--r--include/image.mk2
-rw-r--r--include/verbose.mk20
-rw-r--r--package/Makefile2
-rw-r--r--rules.mk1
5 files changed, 16 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index faeecaa488..a554a1d867 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ RELEASE:=Kamikaze
#--------------------------------------------------------------
TOPDIR=${shell pwd}
export TOPDIR
+include $(TOPDIR)/include/verbose.mk
OPENWRTVERSION:=$(RELEASE)
ifneq ($(VERSION),)
diff --git a/include/image.mk b/include/image.mk
index bf80e27990..ca0d688f17 100644
--- 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)
diff --git a/include/verbose.mk b/include/verbose.mk
index 77a877efe3..31e0cea1b3 100644
--- a/include/verbose.mk
+++ b/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/package/Makefile b/package/Makefile
index e947bcfaea..4b924a390c 100644
--- 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)
- @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/rules.mk b/rules.mk
index d762ae79ed..42aedcfe54 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,5 @@
-include $(TOPDIR)/.config
+include $(TOPDIR)/include/verbose.mk
export SHELL=/bin/bash