-MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
-NST_SUBDIRS = nautilus-sendto-plugin
+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
-DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS)
+DIST_SUBDIRS = $(MY_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
SUBDIRS = $(MY_SUBDIRS)
-if HAVE_NST
-SUBDIRS += $(NST_SUBDIRS)
+if HAVE_GOA
+SUBDIRS += $(GOA_SUBDIRS)
endif
-ACLOCAL_AMFLAGS = -I m4
+if HAVE_UOA
+SUBDIRS += $(UOA_SUBDIRS)
+endif
+
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \