projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
image.mk: change the default of the kernel suffix
[librecmc/librecmc.git]
/
include
/
verbose.mk
diff --git
a/include/verbose.mk
b/include/verbose.mk
index f18e9a2c7105257a7993f284b2220ea548e4280d..b7e43f74300edbe54094641d157ff7f11b3bdd90 100644
(file)
--- a/
include/verbose.mk
+++ b/
include/verbose.mk
@@
-1,35
+1,46
@@
-#
+#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Copyright (C) 2006 OpenWrt.org
#
# 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" # yellow
- _N:="\\033[m" #normal
+ ifneq ($(strip $(NO_COLOR)),1)
+ _Y:=\\033[33m
+ _R:=\\033[31m
+ _N:=\\033[m
+ endif
endif
endif
-define MESSAGE
- echo -e "$(_Y)$(1)$(_N)" >&3
-endef
+ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
+ define MESSAGE
+ printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+ endef
+
+ define ERROR_MESSAGE
+ printf "$(_R)%s$(_N)\n" "$(1)" >&8
+ endef
-ifneq ($(KBUILD_VERBOSE),99)
ifeq ($(QUIET),1)
ifneq ($(CURDIR),$(TOPDIR))
_DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
ifeq ($(QUIET),1)
ifneq ($(CURDIR),$(TOPDIR))
_DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
@@
-37,15
+48,20
@@
ifneq ($(KBUILD_VERBOSE),99)
_DIR:=
endif
_NULL:=$(if $(MAKECMDGOALS),$(shell \
_DIR:=
endif
_NULL:=$(if $(MAKECMDGOALS),$(shell \
- $(call MESSAGE,
"make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)"
); \
+ $(call MESSAGE,
make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)
); \
))
))
+ SUBMAKE=$(MAKE)
else
else
- ifeq ($(KBUILD_VERBOSE),0)
- MAKE:=&>/dev/null $(MAKE)
- endif
+ SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
export QUIET:=1
export QUIET:=1
-
MAKE:=cmd() { $(MAKE) $$* || { 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 -j1 V=s 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
+ ERROR_MESSAGE=$(MESSAGE)
endif
endif