X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=ae9e4dc5bc8aec1221f807da8c9664d2ff5dffdf;hp=3929d3931e0bc52871e9471e01a7cc2383604bcd;hb=d53111417536194edd8bfd66f98630416de72e50;hpb=658bb59ac654bc4bbe95ae1aec17eec2fe9bb499

diff --git a/Makefile.am b/Makefile.am
index 3929d393..ae9e4dc5 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-account-widgets libempathy libempathy-gtk src help tests
+GOA_SUBDIRS = goa-mc-plugin
+UOA_SUBDIRS = ubuntu-online-accounts
 
-if HAVE_MEGAPHONE
-SUBDIRS += megaphone
-endif
+DIST_SUBDIRS = $(MY_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
 
-if HAVE_NOTHERE
-SUBDIRS += nothere
-endif
+SUBDIRS = $(MY_SUBDIRS)
 
-if HAVE_PYTHON
-SUBDIRS += python
+if HAVE_GOA
+SUBDIRS += $(GOA_SUBDIRS)
 endif
 
-if HAVE_TESTS
-SUBDIRS += tests
+if HAVE_UOA
+SUBDIRS += $(UOA_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
@@ -38,14 +39,14 @@ DISTCLEANFILES = 		\
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
 distclean-local:
-	if test "x$(srdcir)" = "x."; then :; else \
+	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_24_0.. --stat) | fmt --split-only > $@.tmp \
+	  (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; \