aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-06 15:49:10 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-06 16:59:52 +0800
commitb73b93e7cfb16579ef6ec18ef01acdac2c6c24f3 (patch)
treec677467f6ac3d093e590b3102f2b0cbb225b5aff
parent006b27d7f0c5dd6efeee83e2c7bb21a60a7a138e (diff)
downloadgsoc2013-empathy-b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3.tar
gsoc2013-empathy-b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3.tar.gz
gsoc2013-empathy-b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3.tar.bz2
gsoc2013-empathy-b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3.tar.lz
gsoc2013-empathy-b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3.tar.xz
gsoc2013-empathy-b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3.tar.zst
gsoc2013-empathy-b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3.zip
Move account plugins to their own dir
https://bugzilla.gnome.org/show_bug.cgi?id=683415
-rw-r--r--configure.ac1
-rw-r--r--ubuntu-online-accounts/cc-plugins/Makefile.am228
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am225
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-aim.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-aim.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-gadugadu.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-gadugadu.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-groupwise.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-groupwise.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-icq.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-icq.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-irc.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-irc.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-jabber.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-jabber.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-local-xmpp.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-local-xmpp.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-mxit.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-mxit.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-myspace.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-myspace.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sametime.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sametime.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sip.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sip.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoo.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoo.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoojp.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoojp.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-zephyr.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-zephyr.h)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin.c)0
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h (renamed from ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin.h)0
-rwxr-xr-xubuntu-online-accounts/cc-plugins/generate-plugins.py33
36 files changed, 242 insertions, 245 deletions
diff --git a/configure.ac b/configure.ac
index 45acac27a..904f4546d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,6 +635,7 @@ AC_CONFIG_FILES([
ubuntu-online-accounts/Makefile
ubuntu-online-accounts/mc-plugin/Makefile
ubuntu-online-accounts/cc-plugins/Makefile
+ ubuntu-online-accounts/cc-plugins/account-plugins/Makefile
ubuntu-online-accounts/cc-plugins/providers/Makefile
ubuntu-online-accounts/cc-plugins/services/Makefile
ubuntu-online-accounts/cc-plugins/app-plugin/Makefile
diff --git a/ubuntu-online-accounts/cc-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/Makefile.am
index b87b19c18..c8c3ce097 100644
--- a/ubuntu-online-accounts/cc-plugins/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/Makefile.am
@@ -1,227 +1 @@
-# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
-# Do NOT edit manually
-SUBDIRS = providers services app-plugin
-
-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 = \
- libaim.la\
- libgadugadu.la\
- libgroupwise.la\
- libicq.la\
- libirc.la\
- libjabber.la\
- libmxit.la\
- libmyspace.la\
- libsip.la\
- liblocal-xmpp.la\
- libsametime.la\
- libyahoojp.la\
- libyahoo.la\
- libzephyr.la \
- $(NULL)
-
-libaim_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-aim.c \
- empathy-accounts-plugin-aim.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libaim_la_LDFLAGS = -module -avoid-version
-libaim_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libgadugadu_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-gadugadu.c \
- empathy-accounts-plugin-gadugadu.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libgadugadu_la_LDFLAGS = -module -avoid-version
-libgadugadu_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libgroupwise_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-groupwise.c \
- empathy-accounts-plugin-groupwise.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libgroupwise_la_LDFLAGS = -module -avoid-version
-libgroupwise_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libicq_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-icq.c \
- empathy-accounts-plugin-icq.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libicq_la_LDFLAGS = -module -avoid-version
-libicq_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libirc_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-irc.c \
- empathy-accounts-plugin-irc.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libirc_la_LDFLAGS = -module -avoid-version
-libirc_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libjabber_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-jabber.c \
- empathy-accounts-plugin-jabber.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libjabber_la_LDFLAGS = -module -avoid-version
-libjabber_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libmxit_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-mxit.c \
- empathy-accounts-plugin-mxit.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libmxit_la_LDFLAGS = -module -avoid-version
-libmxit_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libmyspace_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-myspace.c \
- empathy-accounts-plugin-myspace.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libmyspace_la_LDFLAGS = -module -avoid-version
-libmyspace_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libsip_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-sip.c \
- empathy-accounts-plugin-sip.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libsip_la_LDFLAGS = -module -avoid-version
-libsip_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-liblocal_xmpp_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-local-xmpp.c \
- empathy-accounts-plugin-local-xmpp.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-liblocal_xmpp_la_LDFLAGS = -module -avoid-version
-liblocal_xmpp_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libsametime_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-sametime.c \
- empathy-accounts-plugin-sametime.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libsametime_la_LDFLAGS = -module -avoid-version
-libsametime_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libyahoojp_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-yahoojp.c \
- empathy-accounts-plugin-yahoojp.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libyahoojp_la_LDFLAGS = -module -avoid-version
-libyahoojp_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libyahoo_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-yahoo.c \
- empathy-accounts-plugin-yahoo.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libyahoo_la_LDFLAGS = -module -avoid-version
-libyahoo_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libzephyr_la_SOURCES = \
- empathy-accounts-plugin.c \
- empathy-accounts-plugin.h \
- empathy-accounts-plugin-zephyr.c \
- empathy-accounts-plugin-zephyr.h \
- empathy-accounts-plugin-widget.c \
- empathy-accounts-plugin-widget.h
-libzephyr_la_LDFLAGS = -module -avoid-version
-libzephyr_la_LIBADD = \
- $(UOA_LIBS) \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+SUBDIRS = account-plugins providers services app-plugin
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
new file mode 100644
index 000000000..1d84b2865
--- /dev/null
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
@@ -0,0 +1,225 @@
+# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
+# Do NOT edit manually
+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 = \
+ libaim.la\
+ libgadugadu.la\
+ libgroupwise.la\
+ libicq.la\
+ libirc.la\
+ libjabber.la\
+ libmxit.la\
+ libmyspace.la\
+ libsip.la\
+ liblocal-xmpp.la\
+ libsametime.la\
+ libyahoojp.la\
+ libyahoo.la\
+ libzephyr.la \
+ $(NULL)
+
+libaim_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-aim.c \
+ empathy-accounts-plugin-aim.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libaim_la_LDFLAGS = -module -avoid-version
+libaim_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libgadugadu_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-gadugadu.c \
+ empathy-accounts-plugin-gadugadu.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libgadugadu_la_LDFLAGS = -module -avoid-version
+libgadugadu_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libgroupwise_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-groupwise.c \
+ empathy-accounts-plugin-groupwise.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libgroupwise_la_LDFLAGS = -module -avoid-version
+libgroupwise_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libicq_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-icq.c \
+ empathy-accounts-plugin-icq.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libicq_la_LDFLAGS = -module -avoid-version
+libicq_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libirc_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-irc.c \
+ empathy-accounts-plugin-irc.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libirc_la_LDFLAGS = -module -avoid-version
+libirc_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libjabber_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-jabber.c \
+ empathy-accounts-plugin-jabber.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libjabber_la_LDFLAGS = -module -avoid-version
+libjabber_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libmxit_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-mxit.c \
+ empathy-accounts-plugin-mxit.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libmxit_la_LDFLAGS = -module -avoid-version
+libmxit_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libmyspace_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-myspace.c \
+ empathy-accounts-plugin-myspace.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libmyspace_la_LDFLAGS = -module -avoid-version
+libmyspace_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libsip_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-sip.c \
+ empathy-accounts-plugin-sip.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libsip_la_LDFLAGS = -module -avoid-version
+libsip_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+liblocal_xmpp_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-local-xmpp.c \
+ empathy-accounts-plugin-local-xmpp.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+liblocal_xmpp_la_LDFLAGS = -module -avoid-version
+liblocal_xmpp_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libsametime_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-sametime.c \
+ empathy-accounts-plugin-sametime.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libsametime_la_LDFLAGS = -module -avoid-version
+libsametime_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libyahoojp_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-yahoojp.c \
+ empathy-accounts-plugin-yahoojp.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libyahoojp_la_LDFLAGS = -module -avoid-version
+libyahoojp_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libyahoo_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-yahoo.c \
+ empathy-accounts-plugin-yahoo.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libyahoo_la_LDFLAGS = -module -avoid-version
+libyahoo_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
+
+
+libzephyr_la_SOURCES = \
+ empathy-accounts-plugin.c \
+ empathy-accounts-plugin.h \
+ empathy-accounts-plugin-zephyr.c \
+ empathy-accounts-plugin-zephyr.h \
+ empathy-accounts-plugin-widget.c \
+ empathy-accounts-plugin-widget.h
+libzephyr_la_LDFLAGS = -module -avoid-version
+libzephyr_la_LIBADD = \
+ $(UOA_LIBS) \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-aim.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c
index 426547448..426547448 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-aim.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-aim.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h
index a9e072deb..a9e072deb 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-aim.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-gadugadu.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c
index 2cd60222f..2cd60222f 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-gadugadu.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-gadugadu.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h
index 1a0956e65..1a0956e65 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-gadugadu.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-groupwise.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c
index ddcef5a2c..ddcef5a2c 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-groupwise.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-groupwise.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h
index 00a75377a..00a75377a 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-groupwise.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-icq.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c
index 0f6aa3874..0f6aa3874 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-icq.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-icq.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h
index b3a5e82a6..b3a5e82a6 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-icq.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-irc.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c
index 53c243236..53c243236 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-irc.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-irc.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h
index b3a9a629b..b3a9a629b 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-irc.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-jabber.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c
index fffe98364..fffe98364 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-jabber.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-jabber.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h
index c6e67f873..c6e67f873 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-jabber.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-local-xmpp.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c
index f46741a5c..f46741a5c 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-local-xmpp.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-local-xmpp.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h
index 8c5d56f18..8c5d56f18 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-local-xmpp.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-mxit.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c
index 95fdc2fa7..95fdc2fa7 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-mxit.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-mxit.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h
index 5a80c2c73..5a80c2c73 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-mxit.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-myspace.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c
index 5b848e200..5b848e200 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-myspace.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-myspace.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h
index a6785a86f..a6785a86f 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-myspace.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sametime.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c
index e33593421..e33593421 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sametime.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sametime.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h
index 639ec15e2..639ec15e2 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sametime.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sip.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c
index 483f1b3ce..483f1b3ce 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sip.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sip.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h
index e581f7809..e581f7809 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-sip.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index f76eb5cd4..f76eb5cd4 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
index 17963e656..17963e656 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoo.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c
index 8461bed0b..8461bed0b 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoo.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoo.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h
index 2f02c4a30..2f02c4a30 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoo.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoojp.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c
index 12e771b1f..12e771b1f 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoojp.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoojp.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h
index c57634a75..c57634a75 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-yahoojp.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-zephyr.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c
index e3d0b4ed3..e3d0b4ed3 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-zephyr.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-zephyr.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h
index 90bd4c764..90bd4c764 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-zephyr.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
index 46e429e43..46e429e43 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
diff --git a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
index bb259c8a1..bb259c8a1 100644
--- a/ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
diff --git a/ubuntu-online-accounts/cc-plugins/generate-plugins.py b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
index babe5433c..b3b54f6e2 100755
--- a/ubuntu-online-accounts/cc-plugins/generate-plugins.py
+++ b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
@@ -25,7 +25,7 @@ class Plugin:
self.protocol = protocol
self.icon = icon
-##### The plugin itself #####
+##### account-plugins/ #####
def magic_replace(text, protocol):
p = protocol.replace('-', '_')
@@ -42,7 +42,7 @@ def magic_replace(text, protocol):
def generate_plugin_header(p):
# header
- f = open('empathy-accounts-plugin-%s.h' % p.protocol, 'w')
+ f = open('account-plugins/empathy-accounts-plugin-%s.h' % p.protocol, 'w')
tmp = '''/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
* Do NOT edit manually */
@@ -124,7 +124,7 @@ G_END_DECLS
def generate_plugin_code(p):
# header
- f = open('empathy-accounts-plugin-%s.c' % p.protocol, 'w')
+ f = open('account-plugins/empathy-accounts-plugin-%s.c' % p.protocol, 'w')
tmp = '''/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
* Do NOT edit manually */
@@ -175,12 +175,6 @@ ap_module_get_object_type (void)
f.write(magic_replace (tmp, p.protocol))
-def generate_plugins(plugins):
- '''empathy-accounts-plugin-$protocol.[ch]'''
- for p in plugins:
- generate_plugin_header(p)
- generate_plugin_code(p)
-
def generate_build_block(p):
la = 'lib%s_la' % p.protocol.replace('-', '_')
@@ -200,24 +194,28 @@ def generate_build_block(p):
return output
-def generate_makefile_am(plugins):
- '''Generate Makefile.am'''
+
+def generate_account_plugins(plugins):
+ '''account-plugins/'''
libs = []
build_blocks = []
for p in plugins:
+ # empathy-accounts-plugin-$protocol.[ch]'''
+ generate_plugin_header(p)
+ generate_plugin_code(p)
+
name = ' lib%s.la' % p.protocol
libs.append(name)
build_blocks.append(generate_build_block(p))
- f = open('Makefile.am', 'w')
+ # Makefile.am
+ f = open('account-plugins/Makefile.am', 'w')
f.write(
'''# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
# Do NOT edit manually
-SUBDIRS = providers services app-plugin
-
plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
INCLUDES = \\
@@ -236,7 +234,7 @@ plugin_LTLIBRARIES = \\
%s''' % ('\\\n'.join(libs), '\n\n'.join(build_blocks)))
-##### Providers #####
+##### providers/ #####
def generate_provider_file(p):
f = open('providers/%s.provider' % p.protocol, 'w')
@@ -274,7 +272,7 @@ providers_DATA = \\
EXTRA_DIST = $(providers_DATA)
''' % ('\\\n'.join(providers)))
-##### Services #####
+##### services/ #####
def generate_service_file(p):
f = open('services/%s-im.service' % p.protocol, 'w')
@@ -333,8 +331,7 @@ def generate_all():
for name, cm, protocol, icon in ALL:
plugins.append(Plugin(name, cm, protocol, icon))
- generate_plugins(plugins)
- generate_makefile_am(plugins)
+ generate_account_plugins(plugins)
generate_providers(plugins)
generate_services(plugins)