From 0da0797cb03a7f9835a70e98198d7407d71f728a Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Tue, 2 Apr 2013 17:35:45 +0000 Subject: 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 ........ Merged revisions 384545 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384546 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 63c398021..72b51824b 100644 --- a/Makefile +++ b/Makefile @@ -392,10 +392,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 -- cgit v1.2.3