we have to *always* use a completely silent 'make' invocation for generating the module embedding rules
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96398 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
d16144aac4
commit
4aa174283d
11
Makefile
11
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
|
||||
|
|
Reference in New Issue