diff options
author | Ted Gould <ted@gould.cx> | 2010-11-11 09:25:43 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-11-11 09:25:43 -0600 |
commit | 69960b2da287fcd59b002fbee6083506df1784f9 (patch) | |
tree | 6690de70620175fe5d4a6b2f89b3b6b2d05abd37 /Makefile.am | |
parent | ecc6acd2a576fcc11d51ded532f570fb29ab475e (diff) | |
parent | 022e4bfbcb06a66552007abc8f9f329ce86c9995 (diff) | |
download | libayatana-indicator-69960b2da287fcd59b002fbee6083506df1784f9.tar.gz libayatana-indicator-69960b2da287fcd59b002fbee6083506df1784f9.tar.bz2 libayatana-indicator-69960b2da287fcd59b002fbee6083506df1784f9.zip |
Merging in trunk to solve conflicts
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 8894e24..f290d63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,29 @@ SUBDIRS = \ DISTCLEANFILES = \ libindicator-*.tar.gz +dist-hook: + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo Failed to generate ChangeLog: not a branch >&2; \ + fi + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating AUTHORS && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ + || (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS >&2 ); \ + else \ + echo Failed to generate AUTHORS: not a branch >&2; \ + fi + |