Export the atk-bridge-2.0 library

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

diff --git a/Makefile.am b/Makefile.am
index d00a130..7cdbd54 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS=dbind droute atk-adaptor po schemas
 gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
 gtk_modules_DATA = at-spi2-atk.desktop
 
-EXTRA_DIST = \
-       $(gtk_modules_DATA)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = atk-bridge-2.0.pc
+
+EXTRA_DIST = $(gtk_modules_DATA) atk-bridge-2.0.pc.in
 

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index cf8cce0..48b243a 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS= adaptors . gtk-2.0 gtk-3.0
 
-noinst_LTLIBRARIES = libatk-bridge-2.0.la
+lib_LTLIBRARIES = libatk-bridge-2.0.la
 
 libatk_bridge_2_0_la_CFLAGS = \
        $(DBUS_CFLAGS)    \
@@ -10,6 +10,9 @@ libatk_bridge_2_0_la_CFLAGS = \
        -I$(top_srcdir)/atk-adaptor/adaptors \
        $(P2P_CFLAGS)
 
+atkbridgeincludedir = $(pkgincludedir)/2.0/
+atkbridgeinclude_HEADERS = atk-bridge.h
+
 libatk_bridge_2_0_la_SOURCES =  \
         accessible-leasing.c    \
         accessible-leasing.h    \
@@ -40,4 +43,10 @@ libatk_bridge_2_0_la_LIBADD = \
        $(top_builddir)/droute/libdroute.la \
        $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
 
+libatk_bridge_2_0_la_LDFLAGS = \
+       $(LT_VERSION_INFO)                          \
+       -export-symbols $(srcdir)/atkbridge.symbols \
+       -no-undefined                               \
+       $(AM_LDFLAGS)
+
 EXTRA_DIST = Makefile.include

diff --git a/atk-adaptor/atkbridge.symbols b/atk-adaptor/atkbridge.symbols
new file mode 100644 (file)
index 0000000..bf71c16
--- /dev/null
+++ b/atk-adaptor/atkbridge.symbols
@@ -0,0 +1,2 @@
+adaptor_init
+adaptor_cleanup

diff --git a/atk-bridge-2.0.pc.in b/atk-bridge-2.0.pc.in
new file mode 100644 (file)
index 0000000..6af5861
--- /dev/null
+++ b/atk-bridge-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: atk-bridge-2.0
+Description: ATK/D-Bus Bridge
+Version: @VERSION@
+Requires.Private: gobject-2.0 atspi-2
+Libs: -L${libdir} -latk-bridge-2.0
+Cflags: -I${includedir}/at-spi2-atk/2.0

diff --git a/configure.ac b/configure.ac
index 9e0f171..4de0516 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,7 @@ fi
 AC_SUBST(P2P_CFLAGS)
 
 AC_CONFIG_FILES([Makefile
+                atk-bridge-2.0.pc
                 dbind/dbind-config.h
                 dbind/Makefile
                 droute/Makefile