[asterisk-commits] dlee: branch 11 r384545 - in /branches/11: ./ Makefile

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Apr  2 12:34:50 2013
New Revision: 384545

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384545
Log:
Fixed spurious rebuilds of func_version.

func_version.so was being rebuilt every time, because build.h was
changing every build, because of the cleantest dependency that was
added in r384410 to fix parallel make bugs.

Now build.h will only be created if it does not exist, which was the
original behavior of the Makefile.
........

Merged revisions 384544 from http://svn.asterisk.org/svn/asterisk/branches/1.8

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

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/11/Makefile?view=diff&rev=384545&r1=384544&r2=384545
==============================================================================
--- branches/11/Makefile (original)
+++ branches/11/Makefile Tue Apr  2 12:34:50 2013
@@ -401,10 +401,11 @@
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
+# build.h must depend on cleantest, or parallel make may wipe it out after it's
+# been created. But since build.h contains a timestamp, the cmp trick used above
+# won't work. Just testing for existence is good enough.
 include/asterisk/build.h: cleantest
-	@build_tools/make_build_h > $@.tmp
-	@cmp -s $@.tmp $@ || mv $@.tmp $@
-	@rm -f $@.tmp
+	@test -f $@ || build_tools/make_build_h > $@
 
 $(SUBDIRS_CLEAN):
 	+@$(SUBMAKE) -C $(@:-clean=) clean