diff options
| author | David M. Lee <dlee@digium.com> | 2013-04-02 17:35:45 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-04-02 17:35:45 +0000 |
| commit | 0da0797cb03a7f9835a70e98198d7407d71f728a (patch) | |
| tree | ad0c5e768a0a87ec332be43ac1d2f0d9b42e2c32 /Makefile | |
| parent | 56313ee068af7c9cf35e659dd43ec0c30e8cb386 (diff) | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 |