Integrate leasing scheme in-to atk-bridge.

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

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 5d89a2d..140ede4 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=adaptors
+
 if RELOCATE
     gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
 else
@@ -7,10 +9,9 @@ gtkmodule_LTLIBRARIES = libatk-bridge.la
 
 libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                          $(ATK_CFLAGS)       \
-                         $(DBIND_CFLAGS)     \
-                         $(DROUTE_CFLAGS)    \
                          -I$(top_srcdir)     \
-                         -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+                         -I$(top_srcdir)/atk-adaptor/adaptors \
+                         -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
 libatk_bridge_la_LDFLAGS = -no-undefined  \
                           -module        \
@@ -19,36 +20,24 @@ libatk_bridge_la_LDFLAGS = -no-undefined  \
 
 libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
                          $(ATK_LIBS)       \
-                         $(DBIND_LIBS)     \
-                         $(DROUTE_LIBS)    \
-                         $(top_builddir)/common/libspicommon.la
+                         $(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 =     \
-       accessible-adaptor.c    \
-       accessible-marshaller.c \
-       accessible-marshaller.h \
+        accessible-leasing.c    \
+        accessible-leasing.h    \
+        accessible-cache.c      \
+        accessible-cache.h      \
        accessible-register.c   \
        accessible-register.h   \
-       action-adaptor.c        \
-       adaptors.h              \
-       application-adaptor.c   \
        bridge.c                \
        bridge.h                \
-       collection-adaptor.c    \
-       component-adaptor.c     \
-       document-adaptor.c      \
-       editabletext-adaptor.c  \
+       object.c                \
+       object.h                \
        event.c                 \
-       event.h                 \
-       hyperlink-adaptor.c     \
-       hypertext-adaptor.c     \
-       image-adaptor.c         \
-       selection-adaptor.c     \
-       table-adaptor.c         \
-       text-adaptor.c          \
-       tree-adaptor.c          \
-       tree-adaptor.h          \
-       value-adaptor.c
+       event.h
 
 if RELOCATE
 gtkpathdir = $(gtkmoduledir)/..