summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiraj Razick <siraj.razick@collabora.co.uk>2012-02-03 22:54:41 (GMT)
committerSiraj Razick <siraj.razick@collabora.co.uk>2012-02-17 20:46:52 (GMT)
commitc4508d097d735e52fbd4d5a50177ba9ad6744595 (patch)
treee47f459e2aba1dcbe69aef4d505bc325841d65fb
parentd26187345ce6fb1370139b8bac75eebcf5d082d7 (diff)
downloadtelepathy-salut-c4508d097d735e52fbd4d5a50177ba9ad6744595.tar.gz
telepathy-salut-c4508d097d735e52fbd4d5a50177ba9ad6744595.tar.xz
plugins: Create a new library libsalut-plugins containing the plugin API
The patch moves the symbols required by plugins, into a new library libsalut-plugins.la
-rw-r--r--salut/telepathy-salut-uninstalled.pc.in1
-rw-r--r--salut/telepathy-salut.pc.in1
-rw-r--r--src/Makefile.am28
3 files changed, 23 insertions, 7 deletions
diff --git a/salut/telepathy-salut-uninstalled.pc.in b/salut/telepathy-salut-uninstalled.pc.in
index c5932a4..38c4f23 100644
--- a/salut/telepathy-salut-uninstalled.pc.in
+++ b/salut/telepathy-salut-uninstalled.pc.in
@@ -12,4 +12,5 @@ Description: Link-local XMPP backend for the Telepathy framework (uninstalled)
Version: @VERSION@
Requires: pkg-config >= 0.21
Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.13.12
+Libs: ${abs_top_builddir}/src/libsalut-plugins.la
Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky
diff --git a/salut/telepathy-salut.pc.in b/salut/telepathy-salut.pc.in
index 4292b16..2e5e24c 100644
--- a/salut/telepathy-salut.pc.in
+++ b/salut/telepathy-salut.pc.in
@@ -12,4 +12,5 @@ Description: Link-local XMPP backend for the Telepathy framework
Version: @VERSION@
Requires: pkg-config >= 0.21
Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.13.12
+Libs: -L${libdir} -lsalut-plugins
Cflags: -I${includedir}/telepathy-salut-0
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f501b3..7be8412 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,13 +85,7 @@ CORE_SOURCES = \
protocol.c \
$(top_srcdir)/salut/protocol.h \
plugin-loader.c \
- plugin-loader.h \
- $(top_srcdir)/salut/plugin.h \
- plugin.c \
- $(top_srcdir)/salut/sidecar.h \
- $(top_srcdir)/salut/plugin-connection.h \
- plugin-connection.c \
- sidecar.c
+ plugin-loader.h
AVAHI_BACKEND_SOURCES = \
avahi-discovery-client.h \
@@ -131,6 +125,25 @@ SHA1_SOURCES = \
sha1/sha1-util.h \
sha1/sha1-util.c
+lib_LTLIBRARIES = libsalut-plugins.la
+
+libsalut_plugins_la_LDFLAGS = \
+ -shared \
+ -no-undefined \
+ -avoid-version
+
+libsalut_plugins_la_SOURCES = \
+ $(top_srcdir)/salut/plugin.h \
+ plugin.c \
+ $(top_srcdir)/salut/plugin-connection.h \
+ plugin-connection.c \
+ $(top_srcdir)/salut/capability-set.h \
+ capability-set.c \
+ $(top_srcdir)/salut/sidecar.h \
+ sidecar.c
+
+libsalut_convenience_la_LIBADD = libsalut-plugins.la
+
libsalut_convenience_la_SOURCES = $(CORE_SOURCES) $(BUILT_SOURCES) \
$(SHA1_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES)
@@ -150,6 +163,7 @@ check_c_sources = \
$(CORE_SOURCES) \
$(AVAHI_BACKEND_SOURCES) \
$(DUMMY_BACKEND_SOURCES) \
+ $(libsalut_plugins_la_SOURCES) \
$(write_mgr_file_SOURCES)
include $(top_srcdir)/tools/check-coding-style.mk