Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse

[platform/core/uifw/at-spi2-atk.git] / atk-bridge / Makefile.am

diff --git a/atk-bridge/Makefile.am b/atk-bridge/Makefile.am
index 4896496..3a8d671 100644 (file)
--- a/atk-bridge/Makefile.am
+++ b/atk-bridge/Makefile.am
@@ -1,28 +1,35 @@
-lib_LTLIBRARIES = libatk-bridge.la
+NULL =
+
+moduledir = $(libdir)/gtk-2.0/modules
+module_LTLIBRARIES = libatk-bridge.la
 
 libatk_bridge_la_SOURCES =     \
        bridge.c
 
 libatk_bridge_la_DEPENDENCIES =        \
-       $(top_srcdir)/libspi/application.h
+       $(top_srcdir)/libspi/accessible.h
 
 INCLUDES = -I $(top_srcdir) \
-           -I $(top_builddir)          \
-          -I $(top_srcdir)/libspi      \
-          -I $(top_builddir)/libspi    \
-           -I $(top_builddir)/atk-bridge \
-           $(ATK_BRIDGE_CFLAGS)
+          -I $(top_builddir) \
+          -I $(top_srcdir)/libspi \
+          -I $(top_builddir)/libspi \
+          -I $(top_builddir)/atk-bridge \
+          $(WARN_CFLAGS) \
+          $(ATK_BRIDGE_CFLAGS) \
+          -DG_LOG_DOMAIN=\"atk-bridge\" \
+          $(X_CFLAGS) \
+          $(NULL)
 
 DEPS =         \
        $(libatk)       \
-       $(libbonobo-2)  \
-       $(liboaf-2)     \
-       $(libORBit-2)   \
+       $(libdbus-1) \
+       $(libdbus-glib-1) \
        $(libat-spi)
 
+libatk_bridge_la_LDFLAGS =     \
+       -rpath $(moduledir) -module -avoid-version -no-undefined \
+       @LDFLAGS@
 
-LDFLAGS += -no-undefined
-
-libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) ../libspi/libspi.la
-
-CFLAGS += $(ATK_BRIDGE_CFLAGS)
+libatk_bridge_la_LIBADD = \
+       $(top_builddir)/libspi/libspi.la        \
+       $(ATK_BRIDGE_LIBS)