From: David M. Lee Date: Tue, 2 Apr 2013 17:34:50 +0000 (+0000) Subject: Fixed spurious rebuilds of func_version. X-Git-Tag: 11.5.0-rc1~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=042579a9cb8de9ba034440bea699639b5dbd4047;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. ........ Merged revisions 384544 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@384545 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 0017ed3455..6eb123bb63 100644 --- a/Makefile +++ b/Makefile @@ -401,10 +401,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