X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=2d207666bf88c8de46e79b4f48e7aed6f26c8746;hp=9c336a52ce26e66b16ef78c4bb00a15b4f6cc609;hb=f3eb03e00dbe86f4f336676fe51dfa39d827a002;hpb=b5b294aaff557e837096aab6602fa690b22a84dc

diff --git a/Makefile.am b/Makefile.am
index 9c336a52..2d207666 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,21 @@
-SUBDIRS = po data libempathy libempathy-gtk src doc
+SUBDIRS = 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
+
 DISTCHECK_CONFIGURE_FLAGS =	\
 	--disable-scrollkeeper  \
 	--enable-gtk-doc
@@ -15,11 +27,13 @@ INTLTOOL = 			\
 
 EXTRA_DIST = 			\
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
 	CONTRIBUTORS		\
 	$(INTLTOOL)
 
 DISTCLEANFILES = 		\
+        ChangeLog               \
 	intltool-extract	\
 	intltool-merge		\
 	intltool-update
@@ -28,6 +42,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
+