hal: Branch 'master' - 2 commits

[David Zeuthen]

 Makefile.am |   24 +-----------------------
 1 files changed, 1 insertion(+), 23 deletions(-)

New commits:
diff-tree 1ca5120e19505e547ef90c60525b0d03715a61cc (from parents)
Merge: 7130e72ebfc4bec279d5fb4f485e3c37d43150a1 f7ed323781b2268e8f3f32881358cec841ddb414
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Apr 6 17:19:35 2007 -0400

    Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal-info

diff-tree 7130e72ebfc4bec279d5fb4f485e3c37d43150a1 (from 99a23a544de6a3fec811a81f7ddcd81265994db1)
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Apr 6 17:18:39 2007 -0400

    don't include ChangeLog in the tarballs
    
    We could instead maintain a NEWS file that is updated whenever we bump
    the version number and make an "official release".

diff --git a/Makefile.am b/Makefile.am
index 93537ff..66ac8af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,31 +2,9 @@
 
 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 ChangeLog
+EXTRA_DIST = HACKING
 
 clean-local :
 	rm -f *~