Remove useless m4/Makefile.am and add ChangeLog to distcleanfiles. make distckeck...

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4256f0f864069e459834ddf63916eb74a8070f69..2d207666bf88c8de46e79b4f48e7aed6f26c8746 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@ EXTRA_DIST =                  \
        $(INTLTOOL)
 
 DISTCLEANFILES =               \
+        ChangeLog               \
        intltool-extract        \
        intltool-merge          \
        intltool-update
@@ -41,15 +42,9 @@ DISTCLEANFILES =             \
 # uninstall.
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
-# Build ChangeLog from SVN history (r470 was the first ChangeLog-less checkin).
-# Only build this when in an svn checkout.
-
-ChangeLog:
-       @if test -f $(top_srcdir)/.svn/entries; then \
-               svn log -v --xml -r HEAD:470 $(SVN_ROOT)/$(SVN_MODULE) | \
-                       xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
-                                --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \
-       fi
+ChangeLog: Makefile.am
+       git-log --pretty=short > ChangeLog
+       
 
 dist: ChangeLog