|
@@ -30,12 +30,18 @@ ifeq ($(IS_TTY),1)
|
|
endif
|
|
endif
|
|
|
|
|
|
define ERROR_MESSAGE
|
|
define ERROR_MESSAGE
|
|
- printf "$(_R)%s$(_N)\n" "$(1)" >&8
|
|
|
|
|
|
+ { \
|
|
|
|
+ printf "$(_R)%s$(_N)\n" "$(1)" >&9 || \
|
|
|
|
+ printf "$(_R)%s$(_N)\n" "$(1)"; \
|
|
|
|
+ } >&2 2>/dev/null
|
|
endef
|
|
endef
|
|
|
|
|
|
ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
|
|
ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
|
|
define MESSAGE
|
|
define MESSAGE
|
|
- printf "$(_Y)%s$(_N)\n" "$(1)" >&8
|
|
|
|
|
|
+ { \
|
|
|
|
+ printf "$(_Y)%s$(_N)\n" "$(1)" >&8 || \
|
|
|
|
+ printf "$(_Y)%s$(_N)\n" "$(1)"; \
|
|
|
|
+ } 2>/dev/null
|
|
endef
|
|
endef
|
|
|
|
|
|
ifeq ($(QUIET),1)
|
|
ifeq ($(QUIET),1)
|
|
@@ -44,9 +50,12 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
|
|
else
|
|
else
|
|
_DIR:=
|
|
_DIR:=
|
|
endif
|
|
endif
|
|
- _NULL:=$(if $(MAKECMDGOALS),$(shell \
|
|
|
|
|
|
+ _MESSAGE:=$(if $(MAKECMDGOALS),$(shell \
|
|
$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
|
|
$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
|
|
))
|
|
))
|
|
|
|
+ ifneq ($(strip $(_MESSAGE)),)
|
|
|
|
+ $(info $(_MESSAGE))
|
|
|
|
+ endif
|
|
SUBMAKE=$(MAKE)
|
|
SUBMAKE=$(MAKE)
|
|
else
|
|
else
|
|
SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
|
|
SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
|