don't pass a GError when first trying to start gnome-contacts

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bd8dd6828cff6d5addacab4eae378164295771f5..ae9e4dc5bc8aec1221f807da8c9664d2ff5dffdf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,20 @@
-SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
+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_NST
-SUBDIRS += nautilus-sendto-plugin
+DIST_SUBDIRS = $(MY_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
+
+SUBDIRS = $(MY_SUBDIRS)
+
+if HAVE_GOA
+SUBDIRS += $(GOA_SUBDIRS)
+endif
+
+if HAVE_UOA
+SUBDIRS += $(UOA_SUBDIRS)
 endif
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS =            \
        --disable-scrollkeeper          \
@@ -29,7 +39,7 @@ 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