X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fverbose.mk;h=525fbf1c157178e6d4e2c4c39fa0a93222e31bba;hb=3f6bdefa94e8e1b16910cbb73c86b8ba9dc98ee3;hp=6d7c7ef6c16fd01f9b9a3413c494dced13114704;hpb=594722a4093c9ea95a8718591971d67a0bd7565d;p=openwrt-10.03%2F.git diff --git a/include/verbose.mk b/include/verbose.mk index 6d7c7ef6c..525fbf1c1 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,11 +1,21 @@ -# 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:$ +ifeq ($(NO_TRACE_MAKE),) +NO_TRACE_MAKE := $(MAKE) V=99 +export NO_TRACE_MAKE +endif + ifndef KBUILD_VERBOSE - KBUILD_VERBOSE=0 - ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE=$(V) - endif + KBUILD_VERBOSE:=0 +endif +ifeq ("$(origin V)", "command line") + KBUILD_VERBOSE:=$(V) endif ifneq ($(KBUILD_VERBOSE),99) @@ -18,11 +28,10 @@ ifneq ($(KBUILD_VERBOSE),99) } else export QUIET:=1 - NO_TRACE_MAKE:=$(MAKE) V=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)