[sr-dev] git:master: makefile: quiet output by default
Andrei Pelinescu-Onciul
andrei at iptel.org
Tue Jun 15 17:28:15 CEST 2010
Module: sip-router
Branch: master
Commit: 9f264d53c19edf8658bd0ebaa2f82a291676c3ac
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f264d53c19edf8658bd0ebaa2f82a291676c3ac
Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date: Tue Jun 15 17:26:07 2010 +0200
makefile: quiet output by default
Quiet output is used now by default. For verbose output one can
either add Q=0 /Q=no/ Q=verbose to the make command line
(e.g. make Q=verbose all) or for a more permanent solution one can
run make config with Q set (e.g. make config Q=0).
---
Makefile.defs | 4 +++-
Makefile.rules | 12 ++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Makefile.defs b/Makefile.defs
index 1eb19f5..e34f305 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -78,7 +78,9 @@
# needed to generate dependencies on-the-fly while compiling
# or is empty if the compiler doesn't support it (andrei)
-quiet?=$(if $(filter 1 yes on,$(Q)),silent,verbose)
+
+# default silent, unless Q= 0|no|off|verbose|noisy
+quiet?=$(if $(filter 0 no off verbose noisy,$(Q)),verbose,silent)
# check if already included/exported
diff --git a/Makefile.rules b/Makefile.rules
index f816f8b..9870a77 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -81,17 +81,17 @@ endif # CC_MKDEP_OPTS
silent_cmd_CC=CC ($(CC)) [$(strip $(crt_type) $(NAME))] $@
silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@
-ifneq (,$(filter 1 yes on, $(Q) $(QUIET)))
+ifneq (,$(filter 0 no off verbose noisy, $(Q) $(QUIET)))
+override Q:=
+quiet=verbose
+#shell optional print
+oecho=echo $(1)
+else
quiet=silent
Q=1
MAKE+= --no-print-directory
#shell optional print
oecho=
-else
-override Q:=
-quiet=verbose
-#shell optional print
-oecho=echo $(1)
endif
module_make= if [ -n "$(1)" -a -r "$(1)/Makefile" ]; then \
More information about the sr-dev
mailing list