[telepathy-gabble/master] Install plugin and Wocky headers, and a .pc file

Will Thompson will.thompson at collabora.co.uk
Mon Nov 30 03:51:13 PST 2009


---
 Makefile.am                               |    2 +-
 configure.ac                              |    5 +++-
 gabble/Makefile.am                        |   39 +++++++++++++++++++++++++++++
 gabble/telepathy-gabble-uninstalled.pc.in |   11 ++++++++
 gabble/telepathy-gabble.pc.in             |   11 ++++++++
 5 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 gabble/Makefile.am
 create mode 100644 gabble/telepathy-gabble-uninstalled.pc.in
 create mode 100644 gabble/telepathy-gabble.pc.in

diff --git a/Makefile.am b/Makefile.am
index f12225f..055d8c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs tools extensions lib src data m4 plugins tests
+SUBDIRS = docs tools extensions lib src data m4 plugins tests gabble
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-debug --enable-wocky-gtk-doc
 
diff --git a/configure.ac b/configure.ac
index a50c290..5b2d394 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,5 +268,8 @@ AC_OUTPUT( Makefile \
            lib/ext/Makefile \
            lib/gibber/Makefile \
            lib/loudmouth/Makefile \
-           plugins/Makefile
+           plugins/Makefile \
+           gabble/Makefile \
+           gabble/telepathy-gabble-uninstalled.pc \
+           gabble/telepathy-gabble.pc
 )
diff --git a/gabble/Makefile.am b/gabble/Makefile.am
new file mode 100644
index 0000000..a08e2fd
--- /dev/null
+++ b/gabble/Makefile.am
@@ -0,0 +1,39 @@
+if ENABLE_PLUGINS
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = telepathy-gabble.pc
+
+gabbleincludedir = $(includedir)/telepathy-1.0/gabble
+gabbleinclude_HEADERS = \
+    plugin.h \
+    sidecar.h
+
+# We install these headers under gabble's so that an actual separate Wocky
+# installation won't clash with them.
+wockyincludedir = $(gabbleincludedir)/wocky
+wockyinclude_HEADERS = \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-types.h                  \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky.h                        \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-connector.h              \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-xmpp-connection.h        \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-debug.h                  \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-namespaces.h             \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-utils.h                  \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-xmpp-node.h              \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-xmpp-reader.h            \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-xmpp-stanza.h            \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-xmpp-writer.h            \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-xmpp-error.h             \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-sasl-auth.h              \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-sasl-digest-md5.h        \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-sasl-handler.h           \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-sasl-plain.h             \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-porter.h                 \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-contact.h                \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-bare-contact.h           \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-resource-contact.h       \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-roster.h                 \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-contact-factory.h        \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-session.h                \
+    $(top_srcdir)/lib/ext/wocky/wocky/wocky-pep-service.h
+
+endif
diff --git a/gabble/telepathy-gabble-uninstalled.pc.in b/gabble/telepathy-gabble-uninstalled.pc.in
new file mode 100644
index 0000000..fb33e9f
--- /dev/null
+++ b/gabble/telepathy-gabble-uninstalled.pc.in
@@ -0,0 +1,11 @@
+prefix=
+exec_prefix=
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+Name: Telepathy-Gabble
+Description: 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, gio-2.0, telepathy-glib >= 0.7.37
+Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky
diff --git a/gabble/telepathy-gabble.pc.in b/gabble/telepathy-gabble.pc.in
new file mode 100644
index 0000000..e7fd497
--- /dev/null
+++ b/gabble/telepathy-gabble.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Telepathy-Gabble
+Description: 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, gio-2.0, telepathy-glib >= 0.7.37
+Cflags: -I${includedir}/telepathy-1.0 -I${includedir}/telepathy-1.0/gabble
-- 
1.5.6.5




More information about the telepathy-commits mailing list