X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fverbose.mk;h=b7e43f74300edbe54094641d157ff7f11b3bdd90;hp=e17b1264d85e9cab8dc90c27349f560570e7dae7;hb=f5683a0a86cc53170b750adb9f4f9eaebf640997;hpb=34ffb526a27dc3f1bf16cd6cdebbfa08c40a6d7a diff --git a/include/verbose.mk b/include/verbose.mk index e17b1264d8..b7e43f7430 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -20,13 +20,14 @@ ifeq ($(OPENWRT_VERBOSE),99) endif ifeq ($(NO_TRACE_MAKE),) -NO_TRACE_MAKE := $(MAKE) V=$(subst w,s,$(OPENWRT_VERBOSE)) +NO_TRACE_MAKE := $(MAKE) V=s$(OPENWRT_VERBOSE) export NO_TRACE_MAKE endif ifeq ($(IS_TTY),1) ifneq ($(strip $(NO_COLOR)),1) _Y:=\\033[33m + _R:=\\033[31m _N:=\\033[m endif endif @@ -36,6 +37,10 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),) printf "$(_Y)%s$(_N)\n" "$(1)" >&8 endef + define ERROR_MESSAGE + printf "$(_R)%s$(_N)\n" "$(1)" >&8 + endef + ifeq ($(QUIET),1) ifneq ($(CURDIR),$(TOPDIR)) _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) @@ -49,7 +54,7 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),) else SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1) export QUIET:=1 - SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=s to see what's going on"; false; } } 8>&1 9>&2; cmd + SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with -j1 V=s to see what's going on"; false; } } 8>&1 9>&2; cmd endif .SILENT: $(MAKECMDGOALS) @@ -58,4 +63,5 @@ else define MESSAGE printf "%s\n" "$(1)" endef + ERROR_MESSAGE=$(MESSAGE) endif