[gnome-system-monitor] Generate ChangeLog from git log during make dist

[Chris KÃhl <chriskuehl src gnome org>]

commit dff1390646c0dfdf0cc1458aa3052dd5660bcf11
Author: Chris KÃhl <chrisk openismus com>
Date:   Mon Nov 21 23:06:53 2011 +0100

    Generate ChangeLog from git log during make dist
    
    https://bugzilla.gnome.org/show_bug.cgi?id=496436

 ChangeLog                          |    3 ++-
 ChangeLog.old => ChangeLog.pre-git |    0
 Makefile.am                        |   29 +++++++++++++++++++++++++----
 configure.ac                       |    6 ++++--
 4 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8ba3ad0..c785a6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,2 @@
-git log
+The ChangeLog is auto-generated during 'make dist'. If you are
+seeing this, use 'git log' for a detailed list of changes.
diff --git a/ChangeLog.old b/ChangeLog.pre-git
similarity index 100%
rename from ChangeLog.old
rename to ChangeLog.pre-git
diff --git a/Makefile.am b/Makefile.am
index 8ec12ad..09be157 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,10 +20,31 @@ Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
 
 distuninstallcheck_listfiles = find . -type f -print | grep -v 'scrollkeeper'
 
+if MAINTAINER_MODE
+dist-hook: dist-changelog
+else
+dist-hook:
+endif
+
+.PHONY: dist-changelog
+
+dist-changelog:
+	$(AM_V_at)if git --git-dir=$(top_srcdir)/.git --work-tree=$(top_srcdir) \
+		log --no-merges --date=short --pretty='tformat:%cd  %an  <%ae>%n%n%s%n%n%b' a5b4b868024f89e07fb9e1bf35d94df60568d841.. | \
+	 $(SED)	-e '/^[12]...-[01].-[0123].  [^<>]*  <[^<>]*>$$/,/^$$/ b' \
+		-e '/[^	 ]/,/^[	 ]*$$/ !d' \
+		-e 's/^[	 ]*/	/' \
+		-e 's/^[	 ]*$$//' >.ChangeLog.tmp; \
+	then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
+	else rm -f .ChangeLog.tmp; exit 1; fi
+
+dist_noinst_DATA = \
+	ChangeLog.pre-git
+
 DISTCLEANFILES = \
-  intltool-extract \
-  intltool-merge \
-  intltool-update \
-  gnome-system-monitor.desktop
+	intltool-extract              \
+	intltool-merge                \
+	intltool-update               \
+	gnome-system-monitor.desktop
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/configure.ac b/configure.ac
index 0937c3b..59f5e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
 dnl Process this file with autoconf to produce a configure script.
-
 AC_PREREQ([2.63])
 
 AC_INIT([gnome-system-monitor],
@@ -11,9 +10,12 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-bzip2])
+AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-bzip2])
 AM_SILENT_RULES([yes])
 
+AM_MAINTAINER_MODE([enable])
+GNOME_MAINTAINER_MODE_DEFINES
+
 # Check For programs
 AC_PROG_CC
 AC_PROG_CXX