summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-01-03 23:14:15 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-01-03 23:14:15 +0000
commit4ec793bb14c40d0be9ea5f5b2ee399822d701b59 (patch)
tree472c44943b4f4b94c021600141815bfbdfb61faa
parented97a48feed27b3b41920738944246e2ce6048c1 (diff)
we have to *always* use a completely silent 'make' invocation for generating the module embedding rules
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96398 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index d6c4a5f4b..70aed6f49 100644
--- a/Makefile
+++ b/Makefile
@@ -309,10 +309,11 @@ endif
# comment to print directories during submakes
#PRINT_DIR=yes
+SILENTMAKE:=$(MAKE) --quiet --no-print-directory
ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
-SUBMAKE=$(MAKE) --quiet
+SUBMAKE:=$(MAKE) --quiet
else
-SUBMAKE=$(MAKE) --quiet --no-print-directory
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
endif
# This is used when generating the doxygen documentation
@@ -352,13 +353,13 @@ menuselect.makeopts: menuselect/menuselect menuselect-tree
menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
- @echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+ @echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LDFLAGS):
- @echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+ @echo "EMBED_LDFLAGS+="`$(SILENTMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LIBS):
- @echo "EMBED_LIBS+="`$(SUBMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+ @echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
$(MOD_SUBDIRS_MENUSELECT_TREE):
@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo