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

Wed Jul 30 10:34:09 CDT 2008

Author: kpfleming
Date: Wed Jul 30 10:34:08 2008
New Revision: 134356

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

................
r134355 | kpfleming | 2008-07-30 10:32:14 -0500 (Wed, 30 Jul 2008) | 10 lines

Merged revisions 134352 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134352 | kpfleming | 2008-07-30 10:29:17 -0500 (Wed, 30 Jul 2008) | 2 lines

use the proper method for building version.h

........

................

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://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=134356&r1=134355&r2=134356
==============================================================================

--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Wed Jul 30 10:34:08 2008
@@ -404,12 +404,12 @@
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-main/version.c:
+main/version.c: FORCE
 	@build_tools/make_version_c > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-include/asterisk/version.h:
+include/asterisk/version.h: FORCE
 	@build_tools/make_version_h > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
@@ -907,4 +907,6 @@
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect 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 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
+
+FORCE:


