Fix for Bug 678315 - Remove the bridge module for Gtk+ 3

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

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 9195ac2..2bb3c6b 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,55 +1,53 @@
-SUBDIRS=adaptors
+SUBDIRS= adaptors . gtk-2.0
 
-if RELOCATE
-    gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
-else
-    gtkmoduledir = $(libdir)/gtk-2.0/modules
-endif
-gtkmodule_LTLIBRARIES = libatk-bridge.la
+lib_LTLIBRARIES = libatk-bridge-2.0.la
 
-libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
-                         $(ATK_CFLAGS)       \
-                         -I$(top_srcdir)     \
-                         -I$(top_srcdir)/atk-adaptor/adaptors \
-                         -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+libatk_bridge_2_0_la_CFLAGS = \
+       $(DBUS_CFLAGS)    \
+       $(ATK_CFLAGS)     \
+       $(ATSPI_CFLAGS)   \
+       -I$(top_srcdir)   \
+       -I$(top_srcdir)/atk-adaptor/adaptors \
+       $(P2P_CFLAGS)
 
-libatk_bridge_la_LDFLAGS = -no-undefined  \
-                          -module        \
-                          -avoid-version \
-                          -rpath $(gtkmoduledir)
+atkbridgeincludedir = $(pkgincludedir)/2.0/
+atkbridgeinclude_HEADERS = atk-bridge.h
 
-libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
-                         $(ATK_LIBS)       \
-                         $(X_LIBS)         \
-                         $(top_builddir)/droute/libdroute.la \
-                         $(top_builddir)/common/libspicommon.la \
-                         $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
-
-libatk_bridge_la_SOURCES =     \
+libatk_bridge_2_0_la_SOURCES =  \
         accessible-leasing.c    \
         accessible-leasing.h    \
         accessible-cache.c      \
         accessible-cache.h      \
-       accessible-register.c   \
-       accessible-register.h   \
+       accessible-register.c   \
+       accessible-register.h   \
+       accessible-stateset.c   \
+       accessible-stateset.h   \
+       bitarray.h              \
        introspection.c         \
        introspection.h         \
-       bridge.c                \
-       bridge.h                \
-       object.c                \
-       object.h                \
-       event.c                 \
-       event.h
-
-if RELOCATE
-gnomeautostartdir = $(datadir)/gnome/autostart
-gnomeautostart_DATA = atk-bridge.desktop
-endif
-
-gtkpathdir = $(gtkmoduledir)/..
-EXTRA_DIST = atk-bridge.desktop.in
-CLEANFILES = atk-bridge.desktop
-
-%.desktop: %.desktop.in Makefile.am
-       sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
-       < $< > $@
+       bridge.c                \
+       bridge.h                \
+       object.c                \
+       object.h                \
+       event.c                 \
+       event.h                 \
+       spi-dbus.c              \
+       spi-dbus.h              \
+       atk-bridge.h
+
+libatk_bridge_2_0_la_LIBADD = \
+       $(DBUS_LIBS)          \
+       $(GMODULE_LIBS)       \
+       $(ATK_LIBS)           \
+       $(ATSPI_LIBS)         \
+       $(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 \
+       atkbridge.symbols