Update NEWS file

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4256f0f864069e459834ddf63916eb74a8070f69..4d552e25b2086f7c5847fd3a296908d092f9bc04 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po data libempathy libempathy-gtk src docs
+SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
 
 if HAVE_MEGAPHONE
 SUBDIRS += megaphone
@@ -16,8 +16,11 @@ if HAVE_TESTS
 SUBDIRS += tests
 endif
 
-DISTCHECK_CONFIGURE_FLAGS =    \
-       --disable-scrollkeeper  \
+ACLOCAL_AMFLAGS = -I m4
+
+DISTCHECK_CONFIGURE_FLAGS =            \
+       --disable-scrollkeeper          \
+       --disable-schemas-install       \
        --enable-gtk-doc
 
 INTLTOOL =                     \
@@ -30,9 +33,11 @@ EXTRA_DIST =                         \
         ChangeLog.old           \
         README                  \
        CONTRIBUTORS            \
+       autogen.sh              \
        $(INTLTOOL)
 
 DISTCLEANFILES =               \
+        ChangeLog               \
        intltool-extract        \
        intltool-merge          \
        intltool-update
@@ -41,15 +46,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