From: David M. Lee <dlee@digium.com>
Date: Tue, 2 Apr 2013 17:33:53 +0000 (+0000)
Subject: Fixed spurious rebuilds of func_version.
X-Git-Tag: 1.8.23.0-rc1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0442f6fa953d57b05a1bbc69fbd3c6b2f117a68d;p=thirdparty%2Fasterisk.git

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.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@384544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index d0b24347c5..69b811acaf 100644
--- a/Makefile
+++ b/Makefile
@@ -370,10 +370,11 @@ include/asterisk/buildopts.h: menuselect.makeopts cleantest
 	@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