diff options
| author | Mike Baker <mbm@openwrt.org> | 2006-06-23 21:47:24 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2006-06-23 21:47:24 +0000 |
| commit | 1ef7c9e055a572539e5e7ada6f69a89a3b51fcbe (patch) | |
| tree | e544bc2898739c57399519b16e6eef3303f052f1 /openwrt | |
| parent | e6bd5e37795418e433e38d0d41ecaa269087a1fe (diff) | |
| download | mtk-20170518-1ef7c9e055a572539e5e7ada6f69a89a3b51fcbe.zip mtk-20170518-1ef7c9e055a572539e5e7ada6f69a89a3b51fcbe.tar.gz mtk-20170518-1ef7c9e055a572539e5e7ada6f69a89a3b51fcbe.tar.bz2 | |
switch on new verbose system
SVN-Revision: 4064
Diffstat (limited to 'openwrt')
| -rw-r--r-- | openwrt/Makefile | 1 | ||||
| -rw-r--r-- | openwrt/include/image.mk | 2 | ||||
| -rw-r--r-- | openwrt/include/verbose.mk | 20 | ||||
| -rw-r--r-- | openwrt/package/Makefile | 2 | ||||
| -rw-r--r-- | openwrt/rules.mk | 1 |
5 files changed, 16 insertions, 10 deletions
diff --git a/openwrt/Makefile b/openwrt/Makefile index faeecaa..a554a1d 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 bf80e27..ca0d688 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 77a877e..31e0cea 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 e947bcf..4b924a3 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 d762ae7..42aedcf 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 |