-libspiincludedir = $(includedir)/libspi
-
-libspiinclude_HEADERS = accessible.h \
- application.h \
- atksimpleobject.h \
- desktop.h \
- listener.h \
- registry.h \
- Accessible.h \
- Application.h \
- Desktop.h \
- Event.h \
- Registry.h \
- Relation.h \
- Role.h \
- State.h
-
-Accessible_IDLOUT = Accessible.h Accessible-stubs.c Accessible-skels.c Accessible-common.c
-Application_IDLOUT = Application.h Application-stubs.c Application-skels.c Application-common.c
-Desktop_IDLOUT = Desktop.h Desktop-stubs.c Desktop-skels.c Desktop-common.c
-Event_IDLOUT = Event.h Event-stubs.c Event-skels.c Event-common.c
-Registry_IDLOUT = Registry.h Registry-stubs.c Registry-skels.c Registry-common.c
-Relation_IDLOUT = Relation.h Relation-stubs.c Relation-skels.c Relation-common.c
-Role_IDLOUT = Role.h Role-stubs.c Role-skels.c Role-common.c
-State_IDLOUT = State.h State-stubs.c State-skels.c State-common.c
-
-BUILT_SOURCES = $(Accessible_IDLOUT) \
- $(Application_IDLOUT) \
- $(Desktop_IDLOUT) \
- $(Event_IDLOUT) \
- $(Registry_IDLOUT) \
- $(Relation_IDLOUT) \
- $(Role_IDLOUT) \
- $(State_IDLOUT)
+libspiincludedir = $(includedir)/at-spi-1.0/libspi
+
+libspiinclude_HEADERS = Accessibility.h \
+ accessible.h \
+ eventlistener.h \
+ action.h \
+ application.h \
+ base.h \
+ component.h \
+ deviceeventcontroller.h \
+ editabletext.h\
+ hyperlink.h\
+ hypertext.h\
+ image.h \
+ keystrokelistener.h \
+ keymasks.h \
+ libspi.h \
+ listener.h \
+ relation.h \
+ selection.h \
+ table.h \
+ text.h \
+ value.h
+
+IDL_OUT = Accessibility.h Accessibility-stubs.c Accessibility-skels.c Accessibility-common.c
+
+IDL = \
+ $(top_srcdir)/idl/Accessibility.idl \
+ $(top_srcdir)/idl/Accessible.idl \
+ $(top_srcdir)/idl/Application.idl \
+ $(top_srcdir)/idl/Desktop.idl \
+ $(top_srcdir)/idl/Event.idl \
+ $(top_srcdir)/idl/Registry.idl \
+ $(top_srcdir)/idl/Relation.idl \
+ $(top_srcdir)/idl/Role.idl \
+ $(top_srcdir)/idl/State.idl
+
+BUILT_SOURCES = $(IDL_OUT) Accessibility-imodule.c
+CLEANFILES+=$(IDL_OUT) Accessibility-imodule.c