[geocode-glib] build: Port to using AX_GENERATE_CHANGELOG for the ChangeLog
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geocode-glib] build: Port to using AX_GENERATE_CHANGELOG for the ChangeLog
- Date: Wed, 25 Jan 2017 14:31:34 +0000 (UTC)
commit 2d2c6466a3ed5d1e9932fb939fb9e31bb9403c91
Author: Philip Withnall <withnall endlessm com>
Date: Wed Jan 25 13:48:29 2017 +0000
build: Port to using AX_GENERATE_CHANGELOG for the ChangeLog
This fixes `make dist` with builddir ≠ srcdir.
https://bugzilla.gnome.org/show_bug.cgi?id=777744
ChangeLog | 2 ++
Makefile.am | 13 +++----------
configure.ac | 3 +++
3 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..92bcb9b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+The ChangeLog is auto-generated when releasing.
+If you are seeing this, use 'git log' for a detailed list of changes.
diff --git a/Makefile.am b/Makefile.am
index 1cf4ce7..722a2ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,15 +39,8 @@ MAINTAINERCLEANFILES = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = geocode-glib-1.0.pc
-# Build ChangeLog from GIT history
-ChangeLog:
- @if test -f $(top_srcdir)/.git/HEAD; then \
- git log --stat > $@; \
- fi
-
-dist: ChangeLog
-
-.PHONY: ChangeLog
-
+# Build ChangeLog from git history
+@GENERATE_CHANGELOG_RULES@
+dist-hook: dist-ChangeLog
-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 7e5fa46..cac9fa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,9 @@ AM_CONDITIONAL([ENABLE_INSTALLED_TESTS],
[test "$enable_installed_tests" = "yes"])
AC_SUBST([ENABLE_INSTALLED_TESTS],[$enable_installed_tests])
+# Changelog generation
+AX_GENERATE_CHANGELOG
+
AC_CONFIG_FILES([
Makefile
geocode-glib-1.0.pc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]