Hook cc-plugins to the build system

https://bugzilla.gnome.org/show_bug.cgi?id=680448

diff --git a/configure.ac b/configure.ac
index 711b520a54e1e58b1bcf1172407ce98036a77361..9575d684b25e1d71aca32a63f697d0d57574d358 100644 (file)
--- 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 66c4ddbd4f48e941fb81cf2d9f996a0eb13cb653..60aaf57b5b205fc3ab30a3a8057c70a420b1b38f 100644 (file)
--- 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 (file)
index 0000000..192a378
--- /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 (file)
index 0000000..d416593
--- /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 (file)
index 0000000..6452131
--- /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)