From 1ef7c9e055a572539e5e7ada6f69a89a3b51fcbe Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Fri, 23 Jun 2006 21:47:24 +0000
Subject: [PATCH] switch on new verbose system
SVN-Revision: 4064
---
openwrt/Makefile | 1 +
openwrt/include/image.mk | 2 --
openwrt/include/verbose.mk | 20 ++++++++++++++------
openwrt/package/Makefile | 2 --
openwrt/rules.mk | 1 +
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/openwrt/Makefile b/openwrt/Makefile
index faeecaa488..a554a1d867 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 bf80e27990..ca0d688f17 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 77a877efe3..31e0cea1b3 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 e947bcfaea..4b924a390c 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 d762ae79ed..42aedcfe54 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
--
GitLab