projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] rename kmod-switch-ip175c package to kmod-switch-ip17xx
[openwrt.git]
/
include
/
verbose.mk
diff --git
a/include/verbose.mk
b/include/verbose.mk
index 36e59904ecff5fee634ad82e36104d80f61d6162..9fe27ced52f1324adcfba16cdb84d50f65c3089b 100644
(file)
--- a/
include/verbose.mk
+++ b/
include/verbose.mk
@@
-4,13
+4,10
@@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id:$
ifeq ($(NO_TRACE_MAKE),)
NO_TRACE_MAKE := $(MAKE) V=99
ifeq ($(NO_TRACE_MAKE),)
NO_TRACE_MAKE := $(MAKE) V=99
-SUBMAKE := $(MAKE)
export NO_TRACE_MAKE
export NO_TRACE_MAKE
-export SUBMAKE
endif
ifndef KBUILD_VERBOSE
endif
ifndef KBUILD_VERBOSE
@@
-21,15
+18,17
@@
ifeq ("$(origin V)", "command line")
endif
ifeq ($(IS_TTY),1)
endif
ifeq ($(IS_TTY),1)
- _Y:=\\033[33m
- _N:=\\033[m
+ ifneq ($(strip $(NO_COLOR)),1)
+ _Y:=\\033[33m
+ _N:=\\033[m
+ endif
endif
endif
-define MESSAGE
- printf "$(_Y)%s$(_N)\n" "$(1)" >&3
-endef
-
ifneq ($(KBUILD_VERBOSE),99)
ifneq ($(KBUILD_VERBOSE),99)
+ define MESSAGE
+ printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+ endef
+
ifeq ($(QUIET),1)
ifneq ($(CURDIR),$(TOPDIR))
_DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
ifeq ($(QUIET),1)
ifneq ($(CURDIR),$(TOPDIR))
_DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
@@
-39,13
+38,21
@@
ifneq ($(KBUILD_VERBOSE),99)
_NULL:=$(if $(MAKECMDGOALS),$(shell \
$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
))
_NULL:=$(if $(MAKECMDGOALS),$(shell \
$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
))
+ SUBMAKE=$(MAKE)
else
ifeq ($(KBUILD_VERBOSE),0)
else
ifeq ($(KBUILD_VERBOSE),0)
- MAKE:=>/dev/null 2>&1 $(MAKE)
+ SILENT:=>/dev/null 2>&1
+ else
+ SILENT:=
endif
export QUIET:=1
endif
export QUIET:=1
-
MAKE:=cmd() { $(MAKE) -s $$* || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4
>&2; cmd
+
SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 8>&1 9
>&2; cmd
endif
.SILENT: $(MAKECMDGOALS)
endif
.SILENT: $(MAKECMDGOALS)
+else
+ SUBMAKE=$(MAKE) -w
+ define MESSAGE
+ printf "%s\n" "$(1)"
+ endef
endif
endif