From e0d00106b672aa634da6f400ae9806dc5488eca7 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 30 Jul 2008 15:34:08 +0000 Subject: 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 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134356 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9d5502cf6..5d9bca1d2 100644 --- a/Makefile +++ b/Makefile @@ -404,12 +404,12 @@ defaults.h: makeopts @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 @@ pdf: asterisk.pdf 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: -- cgit v1.2.3