From: Mike Baker <mbm@openwrt.org>
Date: Wed, 11 Apr 2007 22:59:42 +0000 (+0000)
Subject: minor tweaks to the verbose system
X-Git-Tag: reboot~29458
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9b62c7eb9d767956f9bc4066341b24077dce4332;p=oweals%2Fopenwrt.git

minor tweaks to the verbose system

SVN-Revision: 6936
---

diff --git a/Makefile b/Makefile
index 0297dfaf5e..2a5180c61b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,6 @@ SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
 export TOPDIR=${CURDIR}
-ifeq ($(KBUILD_VERBOSE),99)
-  MAKE:=3>/dev/null $(MAKE)
-endif
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
 include $(TOPDIR)/include/verbose.mk
diff --git a/include/verbose.mk b/include/verbose.mk
index 99747ed3fd..6b2d6d044b 100644
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -23,13 +23,17 @@ ifeq ($(IS_TTY),1)
   _N:="\\033[m" #normal
 endif
 
+define MESSAGE
+	echo -e "$(_Y)$(1)$(_N)" >&3
+endef
+
 ifneq ($(KBUILD_VERBOSE),99)
   ifeq ($(QUIET),1)
     $(MAKECMDGOALS): trace
     trace: FORCE
 	@[ -f "$(MAKECMDGOALS)" ] || { \
 		[ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \
-		echo -e "$(_Y)make[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)$(_N)" >&3; \
+		$(call MESSAGE, "make[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)"); \
 	}
   else
     export QUIET:=1
diff --git a/package/Makefile b/package/Makefile
index 9b8f872924..17233bbbfa 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -16,18 +16,23 @@ include $(TMP_DIR)/.packagedeps
 
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
-COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
+COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
 $(STAMP_DIR) $(TARGET_DIR):
 	mkdir -p $@
 
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
+
+%-prereq %-download %-clean: FORCE
+else
 %-prereq %-download %-clean %-compile %-install: FORCE
+endif
 	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-%-prepare: $(TARGET_DIR)
-%-compile: %-prepare
+# .IGNORE: $(COMPILE_PACKAGES) 
 
 $(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
 	@$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@