aboutsummaryrefslogtreecommitdiffstats
path: root/include/verbose.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-07-28 13:00:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-07-28 13:00:43 +0000
commit9c88ba80b9d566ab7e3dc752fa68ae82aed54212 (patch)
tree5b3ff74aeb9762fbad020288051603a39b32cf61 /include/verbose.mk
parent340f1c3a76a20ef6189f9d1c2c5a9f02ca04ba33 (diff)
downloadupstream-9c88ba80b9d566ab7e3dc752fa68ae82aed54212.tar.gz
upstream-9c88ba80b9d566ab7e3dc752fa68ae82aed54212.tar.bz2
upstream-9c88ba80b9d566ab7e3dc752fa68ae82aed54212.zip
more build system cleanup
SVN-Revision: 8206
Diffstat (limited to 'include/verbose.mk')
-rw-r--r--include/verbose.mk20
1 files changed, 12 insertions, 8 deletions
diff --git a/include/verbose.mk b/include/verbose.mk
index 6b2d6d044b..f18e9a2c71 100644
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -8,7 +8,9 @@
ifeq ($(NO_TRACE_MAKE),)
NO_TRACE_MAKE := $(MAKE) V=99
+SUBMAKE := $(MAKE)
export NO_TRACE_MAKE
+export SUBMAKE
endif
ifndef KBUILD_VERBOSE
@@ -29,18 +31,20 @@ endef
ifneq ($(KBUILD_VERBOSE),99)
ifeq ($(QUIET),1)
- $(MAKECMDGOALS): trace
- trace: FORCE
- @[ -f "$(MAKECMDGOALS)" ] || { \
- [ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \
- $(call MESSAGE, "make[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)"); \
- }
+ ifneq ($(CURDIR),$(TOPDIR))
+ _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
+ else
+ _DIR:=
+ endif
+ _NULL:=$(if $(MAKECMDGOALS),$(shell \
+ $(call MESSAGE, "make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)"); \
+ ))
else
- export QUIET:=1
ifeq ($(KBUILD_VERBOSE),0)
MAKE:=&>/dev/null $(MAKE)
endif
- MAKE:=cmd() { $(MAKE) $$* || { echo "Build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4>&2; cmd
+ export QUIET:=1
+ MAKE:=cmd() { $(MAKE) $$* || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4>&2; cmd
endif
.SILENT: $(MAKECMDGOALS)