Import tools from telepathy-glib 0.7.3 and build a static libemp-extensions.la.

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9c336a52ce26e66b16ef78c4bb00a15b4f6cc609..14aa451e5f96c81358756d56b1abc2947f094b72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,23 @@
-SUBDIRS = po data libempathy libempathy-gtk src doc
+SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs
+
+if HAVE_MEGAPHONE
+SUBDIRS += megaphone
+endif
+
+if HAVE_NOTHERE
+SUBDIRS += nothere
+endif
 
 if HAVE_PYTHON
 SUBDIRS += python
 endif
 
+if HAVE_TESTS
+SUBDIRS += tests
+endif
+
+ACLOCAL_AMFLAGS = -I m4
+
 DISTCHECK_CONFIGURE_FLAGS =    \
        --disable-scrollkeeper  \
        --enable-gtk-doc
@@ -15,11 +29,14 @@ INTLTOOL =                  \
 
 EXTRA_DIST =                   \
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
        CONTRIBUTORS            \
+       autogen.sh              \
        $(INTLTOOL)
 
 DISTCLEANFILES =               \
+        ChangeLog               \
        intltool-extract        \
        intltool-merge          \
        intltool-update
@@ -28,6 +45,11 @@ DISTCLEANFILES =             \
 # uninstall.
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
-dist-hook:
-       chmod a+w ${distdir}/ChangeLog
-       if test -d _darcs; then darcs changes >${distdir}/ChangeLog; fi
+ChangeLog: Makefile.am
+       git-log --pretty=short > ChangeLog
+       
+
+dist: ChangeLog
+
+.PHONY: ChangeLog
+