Replace static ChangeLog with dist-hook to generate from git log

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644 (file)
index 3d67183..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-       * configure.ac:
-       Update package version for X11R7 release.
-
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-       * configure.ac:
-       Update package version number for final X11R7 release candidate.
-
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-       * Makefile.am:
-       Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-       * configure.ac:
-       Update package version number for X11R7 RC3 release.
-
-2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-       * Makefile.am:
-       * configure.ac:
-       Update dependencies to work with separate build roots.
-
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-       * configure.ac:
-       Update package version number for RC1 release.
-
-2005-07-18  Daniel Stone  <daniel@freedesktop.org>
-
-       * configure.ac:
-       Actually make extensions optional.
-
-2005-07-09  Keith Packard  <keithp@keithp.com>
-
-       * .cvsignore:
-       Add .cvsignore files
-
-2005-07-07  Keith Packard  <keithp@keithp.com>
-
-       * Makefile.am:
-       * configure.ac:
-       Autodetect extension support. Install manual as xdpyinfo.1
-       Note that autodetection requires changes to xdpyinfo.c as well,
-       which currently lives in the monolithic tree. These changes
-       don't have any effect on monolithic builds.

diff --git a/Makefile.am b/Makefile.am
index cf93b67..e45c79a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ AM_CFLAGS = \
        $(DPY_DMX_CFLAGS) \
        $(DPY_XPRINT_CFLAGS) \
        $(DPY_XTST_CFLAGS)
-       
+
 xdpyinfo_LDADD = \
        $(XDPYINFO_LIBS) \
        $(DPY_XEXT_LIBS) \
@@ -60,8 +60,14 @@ appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
 CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
+
+ChangeLog:
+       (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
 
 SED = sed