make distcheck happy again and remove ChangeLog from tarballs

The contents of the ChangeLog file are already in NEWS.

1 files changed, 2 insertions, 26 deletions

diff --git a/Makefile.am b/Makefile.am
index 64040d09..8a4c8da6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,33 +9,9 @@ pkgconfig_DATA = hal.pc hal-storage.pc
 dbusdir = $(DBUS_SYS_DIR)
 dist_dbus_DATA = hal.conf
 
-MAINTAINERCLEANFILES = ChangeLog
+DISTCLEANFILES = hal.pc hal-storage.pc
 
-# 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 = hal.pc hal-storage.pc intltool-extract intltool-merge intltool-update
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-policy-kit
-
-EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in intltool-extract.in intltool-merge.in intltool-update.in mkinstalldirs ChangeLog
+EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in
 
 clean-local :
 	rm -f *~