projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] base-files: release an attached loop device on umounting
[openwrt.git]
/
include
/
verbose.mk
diff --git
a/include/verbose.mk
b/include/verbose.mk
index
fed83d6
..
2e8ace4
100644
(file)
--- a/
include/verbose.mk
+++ b/
include/verbose.mk
@@
-4,30
+4,36
@@
# 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:$
-if
eq ($(NO_TRACE_MAKE),)
-NO_TRACE_MAKE := $(MAKE) V=99
-SUBMAKE := $(MAKE)
-export NO_TRACE_MAKE
-export SUBMAKE
+if
ndef OPENWRT_VERBOSE
+ OPENWRT_VERBOSE:=
+endif
+ifeq ("$(origin V)", "command line")
+ OPENWRT_VERBOSE:=$(V)
endif
endif
-if
ndef KBUILD_VERBOSE
- KBUILD_VERBOSE:=0
+if
eq ($(OPENWRT_VERBOSE),1)
+ OPENWRT_VERBOSE:=w
endif
endif
-ifeq ("$(origin V)", "command line")
- KBUILD_VERBOSE:=$(V)
+ifeq ($(OPENWRT_VERBOSE),99)
+ OPENWRT_VERBOSE:=s
+endif
+
+ifeq ($(NO_TRACE_MAKE),)
+NO_TRACE_MAKE := $(MAKE) V=s$(OPENWRT_VERBOSE)
+export NO_TRACE_MAKE
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
-if
neq ($(KBUILD_VERBOSE),99
)
+if
eq ($(findstring s,$(OPENWRT_VERBOSE)),
)
define MESSAGE
define MESSAGE
- printf "$(_Y)%s$(_N)\n" "$(1)" >&
3
+ printf "$(_Y)%s$(_N)\n" "$(1)" >&
8
endef
ifeq ($(QUIET),1)
endef
ifeq ($(QUIET),1)
@@
-39,16
+45,16
@@
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
else
- ifeq ($(KBUILD_VERBOSE),0)
- MAKE:=>/dev/null 2>&1 $(MAKE)
- endif
+ SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
export QUIET:=1
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=s to see what's going on"; false; } } 8>&1 9
>&2; cmd
endif
.SILENT: $(MAKECMDGOALS)
else
endif
.SILENT: $(MAKECMDGOALS)
else
+ SUBMAKE=$(MAKE) -w
define MESSAGE
printf "%s\n" "$(1)"
endef
define MESSAGE
printf "%s\n" "$(1)"
endef