Update ChangeLog generation to git

diff --git a/Makefile.am b/Makefile.am
index 128a29cce96a56557135b800c33a32049ea2753c..fe2ebe92347036a8e3d33418005cc7c625d8ee5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,8 +34,8 @@ MAINTAINERCLEANFILES = \
                $(srcdir)/ltmain.sh \
                $(srcdir)/missing \
                $(srcdir)/mkinstalldirs \
+               $(srcdir)/ChangeLog \
                `find "$(srcdir)" -type f -name Makefile.in -print` \
-               `find "$(srcdir)" -type f -name "*~" -print` \
                `$(srcdir)/bootstrap --write-configure`
 # The last line above is a horrible hack.
 # GNU Coding Standards recommends that `make maintainer-clean' should not 
@@ -51,26 +51,21 @@ indent: $(srcdir)/.indent.pro
 
 .PHONY: indent
 
-# Creating ChangeLog from CVS log, using cvs2cl(1):
-
-MAINTAINERCLEANFILES += ChangeLog ChangeLog.bak
-
-EXTRA_DIST += ChangeLog
-
-ChangeLog: $(srcdir)/ChangeLog
-
-$(srcdir)/ChangeLog:
-       @if test -d "$(srcdir)/CVS"; then \
-         (cd "$(srcdir)" && \
-         ./missing --run cvs2cl --stdout --utc --FSF -U AUTHORS) > $@.tmp \
-         && echo "For older changes see ChangeLog.old" >> $@.tmp && mv -f $@.tmp $@ \
+#
+# ChangeLog generation
+#
+CHANGELOG_RANGE =
+ChangeLog:
+       $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \
+         (GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run \
+          git log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \
+         && mv -f $@.tmp "$(srcdir)/ChangeLog" \
          || ($(RM) $@.tmp; \
              echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-             (test -f $@ || echo cvs2cl is required to generate this file >> $@)); \
+             (test -f $@ || echo git-log is required to generate this file >> "$(srcdir)/$@")); \
        else \
          test -f $@ || \
-         (echo A CVS checkout and cvs2cl is required to generate ChangeLog >&2 && \
-         echo A CVS checkout and cvs2cl is required to generate this file >> $@); \
+         (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+         echo A git checkout and git-log is required to generate this file >> "$(srcdir)/$@"); \
        fi
-
-.PHONY: ChangeLog $(srcdir)/ChangeLog
+.PHONY: $(srcdir)/ChangeLog