diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-11 22:59:42 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-11 22:59:42 +0000 |
| commit | 3049bd132af7162a179c8d29f3fc068db8e84f38 (patch) | |
| tree | a6d103297e638a62a0e1319d2652bb946291c6ed | |
| parent | cdce6a14fb57a19714360c62b70c872150949489 (diff) | |
minor tweaks to the verbose system
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6936 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | include/verbose.mk | 6 | ||||
| -rw-r--r-- | package/Makefile | 13 |
3 files changed, 14 insertions, 8 deletions
@@ -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 99747ed3f..6b2d6d044 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 9b8f87292..17233bbbf 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 $@ |