dect
/
asterisk
Archived
13
0
Fork 0

Merged revisions 225581 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r225581 | kpfleming | 2009-10-23 09:00:01 -0500 (Fri, 23 Oct 2009) | 10 lines
  
  Don't force menuselect.makeopts to be rebuilt on every build.
  
  For some reason the menuselect.makeopts file was listed as PHONY in the Makefile,
  resulting in 'make' needing to rebuild it for every build. This then resulted in
  the embedded module rules being rebuilt on every build, which can be slow and is
  unnecessary.
  
  This patch fixes the problem by properly allowing 'make' to know when the
  menuselect.makeopts file needs to be rebuilt (defining the proper dependencies).
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@225582 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2009-10-23 14:02:42 +00:00
parent 5b9cc0a38e
commit af86f47250
1 changed files with 28 additions and 3 deletions

View File

@ -369,8 +369,8 @@ makeopts: configure
@echo "****"
@exit 1
menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts
menuselect/menuselect --check-deps menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
+@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
@ -960,7 +960,32 @@ pdf: asterisk.pdf
asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf
.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs validate-docs _clean
.PHONY: menuselect
.PHONY: main
.PHONY: sounds
.PHONY: clean
.PHONY: dist-clean
.PHONY: distclean
.PHONY: all
.PHONY: prereqs
.PHONY: cleantest
.PHONY: uninstall
.PHONY: _uninstall
.PHONY: uninstall-all
.PHONY: pdf
.PHONY: dont-optimize
.PHONY: badshell
.PHONY: installdirs
.PHONY: validate-docs
.PHONY: _clean
.PHONY: $(SUBDIRS_INSTALL)
.PHONY: $(SUBDIRS_DIST_CLEAN)
.PHONY: $(SUBDIRS_CLEAN)
.PHONY: $(SUBDIRS_UNINSTALL)
.PHONY: $(SUBDIRS)
.PHONY: $(MOD_SUBDIRS_EMBED_LDSCRIPT)
.PHONY: $(MOD_SUBDIRS_EMBED_LDFLAGS)
.PHONY: $(MOD_SUBDIRS_EMBED_LIBS)
FORCE: