diff options
Diffstat (limited to 'src/src.am')
| -rw-r--r-- | src/src.am | 29 |
1 files changed, 19 insertions, 10 deletions
@@ -121,14 +121,22 @@ src_syncevolution_CXXFLAGS = $(PCRECPP_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(CORE_ src_syncevolution_CPPFLAGS = $(src_cppflags) -I$(gdbus_dir) # include Synthesis in distribution: package only files in git if using a git checkout +# +# Need to run autogen.sh in $(distdir)-synthesis and not the final +# $(distdir)/src/synthesis because recent autotools do not copy +# files like config.sub when invoked in $(distdir)/src/synthesis +# (automake 1.11.5, autoconf 2.69), probably because they are +# found in a parent directory. However, these files are needed +# later on during the recursive libsynthesis configure+make. all_dist_hooks += src_dist_hook src_dist_hook: @set -x; [ ! '$(SYNTHESIS_SUBDIR)' ] || \ - mkdir -p $(distdir)/src/synthesis && \ + rm -rf $(distdir)-synthesis && \ + mkdir -p $(distdir)-synthesis && \ if test -d '$(SYNTHESIS_SRC)/.git'; \ then \ - ( ( cd '$(SYNTHESIS_SRC)' && git archive HEAD ) | ( cd '$(distdir)/src/synthesis' && tar xf - && $$SHELL autogen.sh && rm -rf autom4te.cache && find . -name .gitignore -delete ) ) && \ - ( printf '%s' 'Creating ChangeLog...' && \ + ( ( cd '$(SYNTHESIS_SRC)' && git archive HEAD ) | ( cd '$(distdir)-synthesis' && tar xf - && $$SHELL autogen.sh && rm -rf autom4te.cache && find . -name .gitignore -delete ) ) && \ + ( printf 'Creating synthesis ChangeLog... ' && \ ( ( cd '$(SYNTHESIS_SRC)' && \ echo '# Generated by configure. Do not edit.' && \ githash=`git show-ref --head --hash | head -1` && \ @@ -136,18 +144,19 @@ src_dist_hook: echo "# git tag `git describe --tags $$githash`" && \ echo && \ '$(top_srcdir)/missing' --run perl '$(top_srcdir)/build/gen-changelog.pl' ) >ChangeLog.tmp ) && \ - ( mv -f ChangeLog.tmp '$(distdir)/src/synthesis/ChangeLog' && \ - printf '%s\n' ' done.' ) || \ + ( mv -f ChangeLog.tmp '$(distdir)-synthesis/ChangeLog' && \ + printf 'synthesis ChangeLog done\n' ) || \ ( rm -f ChangeLog.tmp ; \ - printf '%s\n' ' failed.'; \ - echo 'Failed to generate ChangeLog.' >&2 ) \ + printf 'synthesis ChangeLog failed\n'; \ + echo 'Failed to generate synthesis ChangeLog.' >&2 ) \ ); \ elif test '$(SYNTHESIS_SRC)' != 'no-synthesis-source'; \ then \ - cp -a '$(SYNTHESIS_SRC)/'* '$(distdir)/src/synthesis' && \ + cp -a '$(SYNTHESIS_SRC)/'* '$(distdir)-synthesis' && \ for i in _build autom4te.cache; do [ ! -d "$(SYNTHESIS_SRC)/$$i" ] || chmod -R u+rwx "$(SYNTHESIS_SRC)/$$i"; done && \ - find '$(distdir)/src/synthesis' -name '.libs' -o -name '*~' -o -name '.*' -o -name '*.o' -o -name '*.lo' -o -name 'CVS' -o -name '.svn' -o -name '.git' -o -name .gitignore -o -name 'autom4te.cache' -print0 | xargs -0 rm -rf; \ - fi + find '$(distdir)-synthesis' -name '.libs' -o -name '*~' -o -name '.*' -o -name '*.o' -o -name '*.lo' -o -name 'CVS' -o -name '.svn' -o -name '.git' -o -name .gitignore -o -name 'autom4te.cache' -print0 | xargs -0 rm -rf; \ + fi && \ + mv '$(distdir)-synthesis' '$(distdir)/src/synthesis' clean-local: testclean rm -rf src/testcases |