hal: Branch 'master'

[David Zeuthen]

 Makefile.am |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletion(-)

New commits:
diff-tree 2cefd63578435f4f2a1be7dc612489131947f65f (from 367ba9f251dbfbc909ee6ee50f4542bef38b6570)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Apr 8 17:20:32 2007 -0400

    add back ChangeLog

diff --git a/Makefile.am b/Makefile.am
index 8a4c8da..14d0716 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,29 @@ pkgconfig_DATA = hal.pc hal-storage.pc
 dbusdir = $(DBUS_SYS_DIR)
 dist_dbus_DATA = hal.conf
 
+# 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
+
+MAINTAINERCLEANFILES = ChangeLog
 DISTCLEANFILES = hal.pc hal-storage.pc
 
-EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in
+EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in ChangeLog
 
 clean-local :
 	rm -f *~