KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor tweaks to the verbose system

Browse source 
SVN-Revision: 6936
This commit is contained in:
Mike Baker 2007-04-11 22:59:42 +00:00
parent 30dfff4849
commit 9b62c7eb9d
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -21,9 +21,6 @@ SHELL:=/usr/bin/env bash
export LC_ALL=C export LC_ALL=C
export LANG=C export LANG=C
export TOPDIR=${CURDIR} export TOPDIR=${CURDIR}
ifeq ($(KBUILD_VERBOSE),99)
MAKE:=3>/dev/null $(MAKE)
endif
export IS_TTY=$(shell tty -s && echo 1 || echo 0) export IS_TTY=$(shell tty -s && echo 1 || echo 0)
include $(TOPDIR)/include/verbose.mk include $(TOPDIR)/include/verbose.mk

6
include/verbose.mk
View file

@ -23,13 +23,17 @@ ifeq ($(IS_TTY),1)
_N:="\\033[m" #normal _N:="\\033[m" #normal
endif endif
define MESSAGE
echo -e "$(_Y)$(1)$(_N)" >&3
endef
ifneq ($(KBUILD_VERBOSE),99) ifneq ($(KBUILD_VERBOSE),99)
ifeq ($(QUIET),1) ifeq ($(QUIET),1)
$(MAKECMDGOALS): trace $(MAKECMDGOALS): trace
trace: FORCE trace: FORCE
@[ -f "$(MAKECMDGOALS)" ] || { \ @[ -f "$(MAKECMDGOALS)" ] || { \
[ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \ [ -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 else
export QUIET:=1 export QUIET:=1

13
package/Makefile
View file

@ -16,18 +16,23 @@ include $(TMP_DIR)/.packagedeps
PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-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)) INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
$(STAMP_DIR) $(TARGET_DIR): $(STAMP_DIR) $(TARGET_DIR):
mkdir -p $@ 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 %-prereq %-download %-clean %-compile %-install: FORCE
endif
$(MAKE) -C $* $(patsubst $*-%,%,$@) $(MAKE) -C $* $(patsubst $*-%,%,$@)
%-prereq: $(STAMP_DIR) $(TARGET_DIR) # .IGNORE: $(COMPILE_PACKAGES)
%-prepare: $(TARGET_DIR)
%-compile: %-prepare
$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo $(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
@$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@ @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@