diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-23 14:00:01 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-23 14:00:01 +0000 |
| commit | d3c90b9f3120916f1bdeef7fc95cdf015fb49a30 (patch) | |
| tree | fdb82790c5a9c445bfbe421aa8ab208830a8c6e6 | |
| parent | e70d83d8db63a9f1ae093a05b71bbd9fd925a281 (diff) | |
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/branches/1.4@225581 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 29 |
1 files changed, 26 insertions, 3 deletions
@@ -322,8 +322,8 @@ makeopts: configure @echo "****" @exit 1 -menuselect.makeopts: menuselect/menuselect menuselect-tree - 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+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules @@ -775,6 +775,29 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di @cat sounds/sounds.xml >> $@ @echo "</menu>" >> $@ -.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all 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 menuselect.makeopts installdirs _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: dont-optimize +.PHONY: badshell +.PHONY: installdirs +.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: |