X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fverbose.mk;h=525fbf1c157178e6d4e2c4c39fa0a93222e31bba;hb=ef998d64e381ed0a92fc73edf4206f7be7335caf;hp=31e0cea1b3107626d776fef4b782f7c4c7c16ec1;hpb=242527ccb9da3ac4cfe50969092a739c8b359321;p=openwrt-10.03%2F.git diff --git a/include/verbose.mk b/include/verbose.mk index 31e0cea1b..525fbf1c1 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,17 +1,22 @@ -# OpenWrt.org 2006 +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id:$ -ifndef KBUILD_VERBOSE - ifeq ($(DUMP),) - KBUILD_VERBOSE=1 - else - KBUILD_VERBOSE=99 - endif - ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE=$(V) - endif +ifeq ($(NO_TRACE_MAKE),) +NO_TRACE_MAKE := $(MAKE) V=99 +export NO_TRACE_MAKE endif +ifndef KBUILD_VERBOSE + KBUILD_VERBOSE:=0 +endif +ifeq ("$(origin V)", "command line") + KBUILD_VERBOSE:=$(V) +endif ifneq ($(KBUILD_VERBOSE),99) ifeq ($(QUIET),1) @@ -26,7 +31,7 @@ ifneq ($(KBUILD_VERBOSE),99) ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif - MAKE:=3>&1 4>&2 $(MAKE) + MAKE:=cmd() { $(MAKE) $$* || { echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; } } 3>&1 4>&2; cmd endif .SILENT: $(MAKECMDGOALS)