Move the D-Bus adaptor code into its own folder within the

atk-adaptor library codebase.

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 1942bbc..8538c4c 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,9 +9,8 @@ gtkmodule_LTLIBRARIES = libatk-bridge.la
 
 libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                          $(ATK_CFLAGS)       \
-                         $(DBIND_CFLAGS)     \
-                         $(DROUTE_CFLAGS)    \
                          -I$(top_srcdir)     \
+                         -I$(top_srcdir)/atk-adaptor/adaptors \
                          -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
 libatk_bridge_la_LDFLAGS = -no-undefined  \
@@ -19,39 +20,19 @@ libatk_bridge_la_LDFLAGS = -no-undefined  \
 
 libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
                          $(ATK_LIBS)       \
-                         $(DBIND_LIBS)     \
-                         $(DROUTE_LIBS)    \
                          $(X_LIBS)         \
                          $(top_builddir)/droute/libdroute.la \
                          $(top_builddir)/dbind/libdbind.la \
-                         $(top_builddir)/common/libspicommon.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-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  \
        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)/..

diff --git a/atk-adaptor/adaptors/Makefile.am b/atk-adaptor/adaptors/Makefile.am
new file mode 100644 (file)
index 0000000..d130c80
--- /dev/null
+++ b/atk-adaptor/adaptors/Makefile.am
@@ -0,0 +1,34 @@
+noinst_LTLIBRARIES = libatk-bridge-adaptors.la
+
+libatk_bridge_adaptors_la_CFLAGS =\
+                         $(DBUS_GLIB_CFLAGS) \
+                         $(ATK_CFLAGS)       \
+                         -I$(top_srcdir)     \
+                         -I$(top_srcdir)/atk-adaptor\
+                         -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+
+libatk_bridge_adaptors_la_LIBADD =\
+                         $(DBUS_GLIB_LIBS) \
+                         $(ATK_LIBS)       \
+                         $(X_LIBS)
+
+libatk_bridge_adaptors_la_SOURCES =\
+       accessible-adaptor.c    \
+       accessible-marshaller.c \
+       accessible-marshaller.h \
+       action-adaptor.c        \
+       adaptors.h              \
+       application-adaptor.c   \
+       collection-adaptor.c    \
+       component-adaptor.c     \
+       document-adaptor.c      \
+       editabletext-adaptor.c  \
+       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

diff --git a/atk-adaptor/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c
similarity index 100%
rename from atk-adaptor/accessible-adaptor.c
rename to atk-adaptor/adaptors/accessible-adaptor.c

diff --git a/atk-adaptor/accessible-marshaller.c b/atk-adaptor/adaptors/accessible-marshaller.c
similarity index 100%
rename from atk-adaptor/accessible-marshaller.c
rename to atk-adaptor/adaptors/accessible-marshaller.c

diff --git a/atk-adaptor/accessible-marshaller.h b/atk-adaptor/adaptors/accessible-marshaller.h
similarity index 100%
rename from atk-adaptor/accessible-marshaller.h
rename to atk-adaptor/adaptors/accessible-marshaller.h

diff --git a/atk-adaptor/action-adaptor.c b/atk-adaptor/adaptors/action-adaptor.c
similarity index 100%
rename from atk-adaptor/action-adaptor.c
rename to atk-adaptor/adaptors/action-adaptor.c

diff --git a/atk-adaptor/adaptors.h b/atk-adaptor/adaptors/adaptors.h
similarity index 100%
rename from atk-adaptor/adaptors.h
rename to atk-adaptor/adaptors/adaptors.h

diff --git a/atk-adaptor/application-adaptor.c b/atk-adaptor/adaptors/application-adaptor.c
similarity index 100%
rename from atk-adaptor/application-adaptor.c
rename to atk-adaptor/adaptors/application-adaptor.c

diff --git a/atk-adaptor/collection-adaptor.c b/atk-adaptor/adaptors/collection-adaptor.c
similarity index 100%
rename from atk-adaptor/collection-adaptor.c
rename to atk-adaptor/adaptors/collection-adaptor.c

diff --git a/atk-adaptor/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c
similarity index 100%
rename from atk-adaptor/component-adaptor.c
rename to atk-adaptor/adaptors/component-adaptor.c

diff --git a/atk-adaptor/document-adaptor.c b/atk-adaptor/adaptors/document-adaptor.c
similarity index 100%
rename from atk-adaptor/document-adaptor.c
rename to atk-adaptor/adaptors/document-adaptor.c

diff --git a/atk-adaptor/editabletext-adaptor.c b/atk-adaptor/adaptors/editabletext-adaptor.c
similarity index 100%
rename from atk-adaptor/editabletext-adaptor.c
rename to atk-adaptor/adaptors/editabletext-adaptor.c

diff --git a/atk-adaptor/hyperlink-adaptor.c b/atk-adaptor/adaptors/hyperlink-adaptor.c
similarity index 100%
rename from atk-adaptor/hyperlink-adaptor.c
rename to atk-adaptor/adaptors/hyperlink-adaptor.c

diff --git a/atk-adaptor/hypertext-adaptor.c b/atk-adaptor/adaptors/hypertext-adaptor.c
similarity index 100%
rename from atk-adaptor/hypertext-adaptor.c
rename to atk-adaptor/adaptors/hypertext-adaptor.c

diff --git a/atk-adaptor/image-adaptor.c b/atk-adaptor/adaptors/image-adaptor.c
similarity index 100%
rename from atk-adaptor/image-adaptor.c
rename to atk-adaptor/adaptors/image-adaptor.c

diff --git a/atk-adaptor/relation-adaptor.c b/atk-adaptor/adaptors/relation-adaptor.c
similarity index 100%
rename from atk-adaptor/relation-adaptor.c
rename to atk-adaptor/adaptors/relation-adaptor.c

diff --git a/atk-adaptor/selection-adaptor.c b/atk-adaptor/adaptors/selection-adaptor.c
similarity index 100%
rename from atk-adaptor/selection-adaptor.c
rename to atk-adaptor/adaptors/selection-adaptor.c

diff --git a/atk-adaptor/streamablecontent-adaptor.c b/atk-adaptor/adaptors/streamablecontent-adaptor.c
similarity index 100%
rename from atk-adaptor/streamablecontent-adaptor.c
rename to atk-adaptor/adaptors/streamablecontent-adaptor.c

diff --git a/atk-adaptor/table-adaptor.c b/atk-adaptor/adaptors/table-adaptor.c
similarity index 100%
rename from atk-adaptor/table-adaptor.c
rename to atk-adaptor/adaptors/table-adaptor.c

diff --git a/atk-adaptor/text-adaptor.c b/atk-adaptor/adaptors/text-adaptor.c
similarity index 100%
rename from atk-adaptor/text-adaptor.c
rename to atk-adaptor/adaptors/text-adaptor.c

diff --git a/atk-adaptor/tree-adaptor.c b/atk-adaptor/adaptors/tree-adaptor.c
similarity index 100%
rename from atk-adaptor/tree-adaptor.c
rename to atk-adaptor/adaptors/tree-adaptor.c

diff --git a/atk-adaptor/tree-adaptor.h b/atk-adaptor/adaptors/tree-adaptor.h
similarity index 100%
rename from atk-adaptor/tree-adaptor.h
rename to atk-adaptor/adaptors/tree-adaptor.h

diff --git a/atk-adaptor/value-adaptor.c b/atk-adaptor/adaptors/value-adaptor.c
similarity index 100%
rename from atk-adaptor/value-adaptor.c
rename to atk-adaptor/adaptors/value-adaptor.c

diff --git a/configure.ac b/configure.ac
index 668df2b..aadf7f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,7 @@ AC_CONFIG_FILES([Makefile
                 dbind/dbind-config.h
                 common/Makefile
                 atk-adaptor/Makefile
+                atk-adaptor/adaptors/Makefile
                 tests/Makefile
                ])