Manually add the GtkVolumeButton to the toolbar instead of fitting an empty hole...

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 87b6c62e3b684cfbd3491e11f543d6ac99cbb1fe..06cdb86535326e1230e8f4ae74cd918ef68fda6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,47 @@
-SUBDIRS = po profiles pixmaps libempathy libempathy-gtk accounts contact-list chat src
+SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
 
-DISTCHECK_CONFIGURE_FLAGS =    \
-       --disable-scrollkeeper
+if HAVE_MEGAPHONE
+SUBDIRS += megaphone
+endif
 
-INTLTOOL =                     \
-       intltool-extract.in     \
-       intltool-merge.in       \
-       intltool-update.in
+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          \
+       --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'
+
+ChangeLog: Makefile.am
+       git-log --pretty=short > ChangeLog
+       
+
+dist: ChangeLog
+
+.PHONY: ChangeLog
+