Generate ChangeLog from git log

svn path=/trunk/; revision=504

diff --git a/Makefile.am b/Makefile.am
index 4256f0f864069e459834ddf63916eb74a8070f69..46101580bce6378ba2c3cb058512e19a8b8e3c51 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,15 +41,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
 

diff --git a/configure.ac b/configure.ac
index cda697702f650056e411d189d9c9242cf6bd388f..c86b1190f48f9a06bbe45c3582e34fddc04a7450 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -89,14 +89,6 @@ PKG_CHECK_MODULES(EMPATHY,
    libebook-1.2
 ])
 
-# -----------------------------------------------------------
-# SVN for ChangeLog generation
-# -----------------------------------------------------------
-
-AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
-AC_SUBST([SVN_MODULE],[empathy])
-AC_SUBST([SVN_BRANCH],["trunk"])
-
 # -----------------------------------------------------------
 # Language Support
 # -----------------------------------------------------------