diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-11 22:45:17 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-11 22:45:17 +0000 |
| commit | d9b6f9ac36798157c0a27426181960c8962282f7 (patch) | |
| tree | 1a9c868dfdd31560217fbe40dc923b5fb55182ec /Makefile | |
| parent | 198644092ea263b9ac6f8526f7ebbabeb2012aae (diff) | |
Merged revisions 199781 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r199781 | seanbright | 2009-06-09 14:08:53 -0400 (Tue, 09 Jun 2009) | 2 lines
Fix all of the parallel build warnings issued when running make -j#.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@200230 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 38 |
1 files changed, 19 insertions, 19 deletions
@@ -371,24 +371,24 @@ menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts menuselect/menuselect --check-deps menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) $(MOD_SUBDIRS_EMBED_LDSCRIPT): - @echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -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+="`$(SILENTMAKE) -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+="`$(SILENTMAKE) -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 - @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts makeopts.embed_rules: menuselect.makeopts @echo "Generating embedded module rules ..." @rm -f $@ - @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT) - @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS) - @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS) + +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT) + +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS) + +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS) $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules @@ -411,10 +411,10 @@ res: main endif $(MOD_SUBDIRS): - @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all + +@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all $(OTHER_SUBDIRS): - @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all + +@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all defaults.h: makeopts @build_tools/make_defaults_h > $@.tmp @@ -442,10 +442,10 @@ include/asterisk/build.h: @rm -f $@.tmp $(SUBDIRS_CLEAN): - @$(SUBMAKE) -C $(@:-clean=) clean + +@$(SUBMAKE) -C $(@:-clean=) clean $(SUBDIRS_DIST_CLEAN): - @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean + +@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean clean: $(SUBDIRS_CLEAN) _clean @@ -918,28 +918,28 @@ nmenuselect: menuselect/nmenuselect menuselect-tree MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" menuselect/menuselect: menuselect/makeopts - $(MAKE_MENUSELECT) menuselect + +$(MAKE_MENUSELECT) menuselect menuselect/cmenuselect: menuselect/makeopts - $(MAKE_MENUSELECT) cmenuselect + +$(MAKE_MENUSELECT) cmenuselect menuselect/gmenuselect: menuselect/makeopts - $(MAKE_MENUSELECT) gmenuselect + +$(MAKE_MENUSELECT) gmenuselect menuselect/nmenuselect: menuselect/makeopts - $(MAKE_MENUSELECT) nmenuselect + +$(MAKE_MENUSELECT) nmenuselect menuselect/makeopts: makeopts - $(MAKE_MENUSELECT) makeopts + +$(MAKE_MENUSELECT) makeopts menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure @echo "Generating input for menuselect ..." @echo "<?xml version=\"1.0\"?>" > $@ @echo >> $@ @echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@ - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done @cat build_tools/cflags.xml >> $@ - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done @if [ "${AST_DEVMODE}" = "yes" ]; then \ cat build_tools/cflags-devmode.xml >> $@; \ fi |