5 files changed, 32 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 711b520a5..9575d684b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,6 +596,9 @@ AC_CONFIG_FILES([
    goa-mc-plugin/Makefile
    ubuntu-online-accounts/Makefile
    ubuntu-online-accounts/mc-plugin/Makefile
+   ubuntu-online-accounts/cc-plugins/Makefile
+   ubuntu-online-accounts/cc-plugins/providers/Makefile
+   ubuntu-online-accounts/cc-plugins/services/Makefile
    help/Makefile
    tests/Makefile
    tests/interactive/Makefile
diff --git a/ubuntu-online-accounts/Makefile.am b/ubuntu-online-accounts/Makefile.am
index 66c4ddbd4..60aaf57b5 100644
--- a/ubuntu-online-accounts/Makefile.am
+++ b/ubuntu-online-accounts/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = mc-plugin
+SUBDIRS = mc-plugin cc-plugins
 
 appdir = $(ACCOUNTS_APPLICATION_FILES_DIR)
 
diff --git a/ubuntu-online-accounts/cc-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/Makefile.am
new file mode 100644
index 000000000..192a378c1
--- /dev/null
+++ b/ubuntu-online-accounts/cc-plugins/Makefile.am
@@ -0,0 +1,16 @@
+SUBDIRS = providers services
+
+plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
+
+INCLUDES =					\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-DLOCALEDIR=\""$(datadir)/locale"\"	\
+	$(UOA_CFLAGS)				\
+	$(WARN_CFLAGS)				\
+	$(ERROR_CFLAGS)				\
+	$(DISABLE_DEPRECATED)			\
+	$(EMPATHY_CFLAGS)
+
+plugin_LTLIBRARIES = \
+	$(NULL)
diff --git a/ubuntu-online-accounts/cc-plugins/providers/Makefile.am b/ubuntu-online-accounts/cc-plugins/providers/Makefile.am
new file mode 100644
index 000000000..d416593d4
--- /dev/null
+++ b/ubuntu-online-accounts/cc-plugins/providers/Makefile.am
@@ -0,0 +1,6 @@
+providersdir = $(ACCOUNTS_PROVIDER_FILES_DIR)
+
+providers_DATA = \
+	$(NULL)
+
+EXTRA_DIST = $(providers_DATA)
diff --git a/ubuntu-online-accounts/cc-plugins/services/Makefile.am b/ubuntu-online-accounts/cc-plugins/services/Makefile.am
new file mode 100644
index 000000000..6452131a1
--- /dev/null
+++ b/ubuntu-online-accounts/cc-plugins/services/Makefile.am
@@ -0,0 +1,6 @@
+servicesdir = $(ACCOUNTS_SERVICE_FILES_DIR)
+
+services_DATA = \
+	$(NULL)
+
+EXTRA_DIST = $(services_DATA)