diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-21 12:53:47 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-21 12:53:47 -0700 |
| commit | f31f20ccb561eabb3c00f975838ebaddbeedbe55 (patch) | |
| tree | 239f1e90cf1075d16d821b8c24a5ab4258b33312 /Makefile.am | |
| parent | d48881774ff4ad74f0d94b95c8908ed44fc681fb (diff) | |
| parent | 0984bba3c88293a611fdf509954b28db8b6452ed (diff) | |
| download | mate-media-f31f20ccb561eabb3c00f975838ebaddbeedbe55.tar.bz2 mate-media-f31f20ccb561eabb3c00f975838ebaddbeedbe55.tar.xz | |
Merge pull request #34 from infirit/master
Remove obsolete/autogenerated files and update EXTRA_DIST
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 631f3b6..13bdb05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,13 +35,11 @@ EXTRA_DIST = \ .version \ autogen.sh \ configure \ + ChangeLog \ COPYING \ COPYING-DOCS \ COPYING.gst-mixer \ build-aux/git-version-gen \ - build-aux/mate-doc-utils.make \ - m4/as-compiler-flag.m4 \ - m4/as-version.m4 \ $(INTLTOOL_BUILT:=.in) \ $(NULL) @@ -50,7 +48,7 @@ DISTCLEANFILES = \ po/.intltool-merge-cache \ $(NULL) -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} # see build-aux/git-version-get for details BUILT_SOURCES = $(top_srcdir)/.version @@ -59,4 +57,17 @@ $(top_srcdir)/.version: dist-hook: echo $(VERSION) > $(distdir)/.tarball-version + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/build-aux/missing --run git log --stat ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(distdir)/ChangeLog \ + || ( rm -f ChangeLog.tmp ; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo A git clone is required to generate a ChangeLog >&2; \ + fi + -include $(top_srcdir)/git.mk |