X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=f86a3a46f078ebe64ed36e7913dca6340fa9bdd0;hp=4792946212c63d130db0ae372fe47ef6a408b3cf;hb=2a7fa12bcf9c0ee5a9ff506bc88af2194990dabc;hpb=04c60d1cb44e08a1da88806ff413a51219bdf1f3

diff --git a/Makefile.am b/Makefile.am
index 47929462..f86a3a46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,35 @@
-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
+MY_SUBDIRS = tools extensions po data telepathy-yell libempathy libempathy-gtk src help tests
+NST_SUBDIRS = nautilus-sendto-plugin
+GOA_SUBDIRS = goa-mc-plugin
 
-if HAVE_MEGAPHONE
-SUBDIRS += megaphone
-endif
+DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS)
 
-if HAVE_NOTHERE
-SUBDIRS += nothere
-endif
+SUBDIRS = $(MY_SUBDIRS)
 
-if HAVE_PYTHON
-SUBDIRS += python
+if HAVE_NST
+SUBDIRS += $(NST_SUBDIRS)
 endif
 
-if HAVE_TESTS
-SUBDIRS += tests
+if HAVE_GOA
+SUBDIRS += $(GOA_SUBDIRS)
 endif
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--disable-scrollkeeper		\
-	--disable-schemas-install	\
-	--enable-gtk-doc
+	--disable-schemas-install
 
 EXTRA_DIST = 			\
-        ChangeLog               \
-        ChangeLog.old           \
-        README                  \
-	CONTRIBUTORS		\
-	autogen.sh
+        CONTRIBUTORS \
+        COPYING-DOCS \
+        COPYING.LGPL \
+        COPYING.SHARE-ALIKE \
+        ChangeLog \
+        ChangeLog.old \
+        README \
+        autogen.sh \
+        $(NULL)
 
 DISTCLEANFILES = 		\
         ChangeLog
@@ -37,11 +38,24 @@ DISTCLEANFILES = 		\
 # uninstall.
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
-ChangeLog: Makefile.am
-	git log --pretty=short > ChangeLog
-	
-
-dist: ChangeLog
+distclean-local:
+	if test "x$(srcdir)" = "x."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	@echo Creating $@
+	@if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log EMPATHY_2_27_1.. --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
 
 .PHONY: ChangeLog