Yet more build fixes

diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include
index bf3fb03..eb77435 100644 (file)
--- a/atk-adaptor/Makefile.include
+++ b/atk-adaptor/Makefile.include
@@ -32,6 +32,7 @@ libatk_bridge_la_SOURCES =    \
        $(top_builddir)/atk-adaptor/accessible-register.h       \
        $(top_builddir)/atk-adaptor/accessible-stateset.c \
        $(top_builddir)/atk-adaptor/accessible-stateset.h \
+       $(top_builddir)/atk-adaptor/bitarray.h \
        $(top_builddir)/atk-adaptor/introspection.c         \
        $(top_builddir)/atk-adaptor/introspection.h         \
        $(top_builddir)/atk-adaptor/bridge.c            \
@@ -39,4 +40,6 @@ libatk_bridge_la_SOURCES =    \
        $(top_builddir)/atk-adaptor/object.c            \
        $(top_builddir)/atk-adaptor/object.h            \
        $(top_builddir)/atk-adaptor/event.c                     \
-       $(top_builddir)/atk-adaptor/event.h
+       $(top_builddir)/atk-adaptor/event.h \
+       $(top_builddir)/atk-adaptor/spi-dbus.c \
+       $(top_builddir)/atk-adaptor/spi-dbus.h

diff --git a/atk-adaptor/spi-dbus.c b/atk-adaptor/spi-dbus.c
index b7dc881..b448510 100644 (file)
--- a/atk-adaptor/spi-dbus.c
+++ b/atk-adaptor/spi-dbus.c
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <dbus/dbus.h>
 
-#include "spi-types.h"
+#include <atspi/atspi.h>
 
 DBusMessage *
 spi_dbus_general_error (DBusMessage * message)
@@ -130,7 +130,7 @@ dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...)
   return TRUE;
 }
 
-dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e)
+dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const AtspiDeviceEvent *e)
 {
   DBusMessageIter iter;
 
@@ -139,7 +139,7 @@ dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibili
   return spi_dbus_message_iter_append_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID);
 }
 
-dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e)
+dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, AtspiDeviceEvent *e)
 {
   DBusMessageIter iter;
 

diff --git a/configure.ac b/configure.ac
index 609986b..096e98e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@ AC_CONFIG_FILES([Makefile
                 dbind/dbind-config.h
                 dbind/Makefile
                 droute/Makefile
-                common/Makefile
                 atk-adaptor/Makefile
                 atk-adaptor/adaptors/Makefile
                 atk-adaptor/gtk-2.0/Makefile