X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=ae9e4dc5bc8aec1221f807da8c9664d2ff5dffdf;hp=374608ff63eaecd4bff548db1b12506b8723a3ea;hb=41b03a4aa6782c6345cd048b40344ae0cea2635e;hpb=c15466cbbd83a69ac733fb5645f9c5df815d9250

diff --git a/Makefile.am b/Makefile.am
index 374608ff..ae9e4dc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,57 +1,61 @@
-SUBDIRS = po data libempathy libempathy-gtk src docs
+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
 
-DISTCHECK_CONFIGURE_FLAGS =	\
-	--disable-scrollkeeper  \
-	--enable-gtk-doc
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-INTLTOOL = 			\
-	intltool-extract.in 	\
-	intltool-merge.in 	\
-	intltool-update.in
+DISTCHECK_CONFIGURE_FLAGS =		\
+	--disable-scrollkeeper		\
+	--disable-schemas-install
 
 EXTRA_DIST = 			\
-        ChangeLog               \
-        README                  \
-	CONTRIBUTORS		\
-	$(INTLTOOL)
+        CONTRIBUTORS \
+        COPYING-DOCS \
+        COPYING.LGPL \
+        COPYING.SHARE-ALIKE \
+        ChangeLog \
+        ChangeLog.old \
+        README \
+        autogen.sh \
+        $(NULL)
 
 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'
 
-# Build ChangeLog from SVN history (r470 was the first ChangeLog-less checkin).
-# Only build this when in an svn checkout.
+distclean-local:
+	if test "x$(srcdir)" = "x."; then :; else \
+		rm -f ChangeLog; \
+	fi
 
 ChangeLog:
-	@if test -f $(top_srcdir)/.svn/entries; then \
-		svn log -v --xml -r HEAD:470 $(SVN_ROOT)/$(SVN_MODULE) | \
-			xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
-				 --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \
+	@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
-	@cat $(top_srcdir)/ChangeLog.old >> $@
-
-dist: ChangeLog
 
 .PHONY: ChangeLog