hal: Branch 'master'

[David Zeuthen]

 Makefile.am |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletion(-)

New commits:
diff-tree 823a4d9ef45841257aac1710e8c6ca8610c68f69 (from 1ca5120e19505e547ef90c60525b0d03715a61cc)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Apr 8 17:21:51 2007 -0400

    revert "don't include ChangeLog in the tarballs"
    
    This reverts commit 7130e72ebfc4bec279d5fb4f485e3c37d43150a1.

diff --git a/Makefile.am b/Makefile.am
index 66ac8af..93537ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,31 @@
 
 SUBDIRS = fdi
 
+MAINTAINERCLEANFILES = ChangeLog
+
+# Creating ChangeLog from git log (taken from cairo/Makefile.am):
+
+ChangeLog: $(srcdir)/ChangeLog
+
+$(srcdir)/ChangeLog:
+	@if test -d "$(srcdir)/.git"; then \
+	  (cd "$(srcdir)" && \
+	  ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (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 >> $@); \
+	fi
+
+.PHONY: ChangeLog $(srcdir)/ChangeLog
+
 DISTCLEANFILES =
 
-EXTRA_DIST = HACKING
+EXTRA_DIST = HACKING ChangeLog
 
 clean-local :
 	rm -f *~