switch on new verbose system

SVN-Revision: 4064
This commit is contained in:
Mike Baker 2006-06-23 21:47:24 +00:00
parent e6bd5e3779
commit 1ef7c9e055
5 changed files with 16 additions and 10 deletions

View File

@ -26,6 +26,7 @@ RELEASE:=Kamikaze
#-------------------------------------------------------------- #--------------------------------------------------------------
TOPDIR=${shell pwd} TOPDIR=${shell pwd}
export TOPDIR export TOPDIR
include $(TOPDIR)/include/verbose.mk
OPENWRTVERSION:=$(RELEASE) OPENWRTVERSION:=$(RELEASE)
ifneq ($(VERSION),) ifneq ($(VERSION),)

View File

@ -1,5 +1,3 @@
include $(TOPDIR)/rules.mk
KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
ifneq ($(CONFIG_BIG_ENDIAN),y) ifneq ($(CONFIG_BIG_ENDIAN),y)

View File

@ -1,14 +1,19 @@
# OpenWrt.org 2006 # OpenWrt.org 2006
# $Id:$ # $Id:$
ifeq ($(DUMP),)
ifndef KBUILD_VERBOSE ifndef KBUILD_VERBOSE
KBUILD_VERBOSE=0 ifeq ($(DUMP),)
KBUILD_VERBOSE=1
else
KBUILD_VERBOSE=99
endif
ifeq ("$(origin V)", "command line") ifeq ("$(origin V)", "command line")
KBUILD_VERBOSE=$(V) KBUILD_VERBOSE=$(V)
endif endif
endif endif
ifneq ($(KBUILD_VERBOSE),99)
ifeq ($(QUIET),1) ifeq ($(QUIET),1)
$(MAKECMDGOALS): trace $(MAKECMDGOALS): trace
trace: FORCE trace: FORCE
@ -18,6 +23,9 @@ ifeq ($(DUMP),)
} }
else else
export QUIET:=1 export QUIET:=1
ifeq ($(KBUILD_VERBOSE),0)
MAKE:=&>/dev/null $(MAKE)
endif
MAKE:=3>&1 4>&2 $(MAKE) MAKE:=3>&1 4>&2 $(MAKE)
endif endif

View File

@ -17,11 +17,9 @@ $(STAMP_DIR) $(TARGET_DIR):
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)" $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
%-compile: $(STAMP_DIR) $(TARGET_DIR) %-compile: $(STAMP_DIR) $(TARGET_DIR)
@echo "-> make $@"
$(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)" $(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
%-install: $(STAMP_DIR) $(TARGET_DIR) %-install: $(STAMP_DIR) $(TARGET_DIR)
@echo "-> make $@"
$(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)" $(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
%-clean: $(STAMP_DIR) $(TARGET_DIR) %-clean: $(STAMP_DIR) $(TARGET_DIR)

View File

@ -1,4 +1,5 @@
-include $(TOPDIR)/.config -include $(TOPDIR)/.config
include $(TOPDIR)/include/verbose.mk
export SHELL=/bin/bash export SHELL=/bin/bash