Support incoming muc invitation.Fixes bug #525559 (Guillaume Desmottes)

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 374608ff63eaecd4bff548db1b12506b8723a3ea..06cdb86535326e1230e8f4ae74cd918ef68fda6c 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,40 +16,30 @@ if HAVE_TESTS
 SUBDIRS += tests
 endif
 
-DISTCHECK_CONFIGURE_FLAGS =    \
-       --disable-scrollkeeper  \
-       --enable-gtk-doc
+ACLOCAL_AMFLAGS = -I m4
 
-INTLTOOL =                     \
-       intltool-extract.in     \
-       intltool-merge.in       \
-       intltool-update.in
+DISTCHECK_CONFIGURE_FLAGS =            \
+       --disable-scrollkeeper          \
+       --disable-schemas-install       \
+       --enable-gtk-doc
 
 EXTRA_DIST =                   \
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
        CONTRIBUTORS            \
-       $(INTLTOOL)
+       autogen.sh
 
 DISTCLEANFILES =               \
-       intltool-extract        \
-       intltool-merge          \
-       intltool-update
+        ChangeLog
 
 # Workaround broken scrollkeeper that doesn't remove its files on
 # 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
-       @cat $(top_srcdir)/ChangeLog.old >> $@
+ChangeLog: Makefile.am
+       git-log --pretty=short > ChangeLog
+       
 
 dist: ChangeLog