X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fverbose.mk;h=cbbad6bdfdf53a47f6c51709239f74a947030cfe;hb=a96491e6df3704698a0474906504a329e24c0c7a;hp=b7e43f74300edbe54094641d157ff7f11b3bdd90;hpb=375587f4b29039d86880030c6ab9a135e0342567;p=librecmc%2Flibrecmc.git diff --git a/include/verbose.mk b/include/verbose.mk index b7e43f7430..cbbad6bdfd 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -5,22 +5,22 @@ # See /LICENSE for more information. # -ifndef OPENWRT_VERBOSE - OPENWRT_VERBOSE:= +ifndef LIBRECMC_VERBOSE + LIBRECMC_VERBOSE:= endif ifeq ("$(origin V)", "command line") - OPENWRT_VERBOSE:=$(V) + LIBRECMC_VERBOSE:=$(V) endif -ifeq ($(OPENWRT_VERBOSE),1) - OPENWRT_VERBOSE:=w +ifeq ($(LIBRECMC_VERBOSE),1) + LIBRECMC_VERBOSE:=w endif -ifeq ($(OPENWRT_VERBOSE),99) - OPENWRT_VERBOSE:=s +ifeq ($(LIBRECMC_VERBOSE),99) + LIBRECMC_VERBOSE:=s endif ifeq ($(NO_TRACE_MAKE),) -NO_TRACE_MAKE := $(MAKE) V=s$(OPENWRT_VERBOSE) +NO_TRACE_MAKE := $(MAKE) V=s$(LIBRECMC_VERBOSE) export NO_TRACE_MAKE endif @@ -32,7 +32,7 @@ ifeq ($(IS_TTY),1) endif endif -ifeq ($(findstring s,$(OPENWRT_VERBOSE)),) +ifeq ($(findstring s,$(LIBRECMC_VERBOSE)),) define MESSAGE printf "$(_Y)%s$(_N)\n" "$(1)" >&8 endef @@ -52,9 +52,9 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),) )) SUBMAKE=$(MAKE) else - SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1) + SILENT:=>/dev/null $(if $(findstring w,$(LIBRECMC_VERBOSE)),,2>&1) export QUIET:=1 - 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 + SUBMAKE=cmd() { $(SILENT) $(MAKE) -s "$$@" < /dev/null || { echo "make $$*: build failed. Please re-run make with -j1 V=s or V=sc for a higher verbosity level to see what's going on"; false; } } 8>&1 9>&2; cmd endif .SILENT: $(MAKECMDGOALS)