X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=14aa451e5f96c81358756d56b1abc2947f094b72;hp=a14dcd113f10af19a9f9ec4d0ac80e69cb5a0792;hb=c3751daec7cca3e44abfed1db475cf0fc4703d66;hpb=214850e492efd75f8664bbfb98c6dd6bf161aeb6

diff --git a/Makefile.am b/Makefile.am
index a14dcd11..14aa451e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,26 @@
-SUBDIRS = po profiles pixmaps libempathy libempathy-gtk src
+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
+	--disable-scrollkeeper  \
+	--enable-gtk-doc
 
 INTLTOOL = 			\
 	intltool-extract.in 	\
@@ -10,11 +29,14 @@ INTLTOOL = 			\
 
 EXTRA_DIST = 			\
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
 	CONTRIBUTORS		\
+	autogen.sh		\
 	$(INTLTOOL)
 
 DISTCLEANFILES = 		\
+        ChangeLog               \
 	intltool-extract	\
 	intltool-merge		\
 	intltool-update
@@ -23,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
+