From 1ad3cfd38b04d602003ef83e8e3b0a0f17e9bc9a Mon Sep 17 00:00:00 2001 From: infirit Date: Mon, 21 Oct 2013 16:11:49 +0200 Subject: Remove doc utils from EXTRA_DIST --- Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 631f3b6..418835b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,6 @@ EXTRA_DIST = \ 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) \ -- cgit v1.2.1 From f89f4b1956928f2150cdc4636baf025cbc4ddbcf Mon Sep 17 00:00:00 2001 From: infirit Date: Mon, 21 Oct 2013 17:35:10 +0200 Subject: Remove custom macros from EXTRA_DIST --- Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 418835b..6ceb17b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,8 +39,6 @@ EXTRA_DIST = \ COPYING-DOCS \ COPYING.gst-mixer \ build-aux/git-version-gen \ - m4/as-compiler-flag.m4 \ - m4/as-version.m4 \ $(INTLTOOL_BUILT:=.in) \ $(NULL) @@ -49,7 +47,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 -- cgit v1.2.1 From e5921d6f71357a643b98a43b3d08467aa281530f Mon Sep 17 00:00:00 2001 From: infirit Date: Mon, 21 Oct 2013 19:38:45 +0200 Subject: Generate ChangeLog from git log --- Makefile.am | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 6ceb17b..13bdb05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ EXTRA_DIST = \ .version \ autogen.sh \ configure \ + ChangeLog \ COPYING \ COPYING-DOCS \ COPYING.gst-mixer \ @@ -56,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 -- cgit v1.2.1