[asterisk-commits] kpfleming: branch 1.6.0 r225583 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Fri Oct 23 09:05:57 2009
New Revision: 225583

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=225583
Log:
Merged revisions 225582 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r225582 | kpfleming | 2009-10-23 09:02:42 -0500 (Fri, 23 Oct 2009) | 17 lines
  
  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).
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile?view=diff&rev=225583&r1=225582&r2=225583
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Fri Oct 23 09:05:57 2009
@@ -356,8 +356,8 @@
 	@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):
 	+ at echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
@@ -902,6 +902,30 @@
 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 main/version.c include/asterisk/version.h installdirs
+.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: _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: