Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse

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

diff --git a/libspi/Makefile.am b/libspi/Makefile.am
index 1dad2cd..5ba1b47 100644 (file)
--- a/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@ -6,115 +6,51 @@ INCLUDES = -I$(top_srcdir)   \
            -I$(top_builddir)   \
            $(LIBSPI_DEBUG_CFLAGS)      \
            $(WARN_CFLAGS)      \
-           $(LIBSPI_CFLAGS)
+           $(LIBSPI_CFLAGS)     \
+           $(X_CFLAGS)
 
 libspi_la_LDFLAGS = @LT_VERSION_INFO@ -no-undefined
+libspi_la_CFLAGS = -DATSPI_DBUS_INTROSPECTION_DIRECTORY="\"$(datadir)/at-spi/dbus\""
 libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS)
 
 libspiincludedir = $(includedir)/at-spi-1.0/libspi
 
 libspiinclude_HEADERS =                \
        Accessibility.h         \
-       accessible.h            \
-       eventlistener.h         \
-       action.h                \
-       application.h           \
-       base.h                  \
-       component.h             \
-       editabletext.h          \
-       hyperlink.h             \
-       hypertext.h             \
-       image.h                 \
-       devicelistener.h        \
-       keystrokelistener.h     \
-       keymasks.h              \
-       libspi.h                \
-       listener.h              \
-       relation.h              \
-       remoteobject.h          \
-       selection.h             \
-       stateset.h              \
-       streamablecontent.h     \
-       table.h                 \
-       text.h                  \
-       value.h
+       accessible.h \
+       bitarray.h \
+       droute.h \
+       introspect-loader.h
 
-IDL_OUT = Accessibility.h Accessibility-stubs.c Accessibility-skels.c Accessibility-common.c
-
-IDL_DEPS = \
-       $(top_srcdir)/idl/Accessibility.idl                     \
-       $(top_srcdir)/idl/Accessibility_Accessible.idl          \
-       $(top_srcdir)/idl/Accessibility_Action.idl              \
-       $(top_srcdir)/idl/Accessibility_Application.idl         \
-       $(top_srcdir)/idl/Accessibility_Component.idl           \
-       $(top_srcdir)/idl/Accessibility_Desktop.idl             \
-       $(top_srcdir)/idl/Accessibility_EditableText.idl        \
-       $(top_srcdir)/idl/Accessibility_Event.idl               \
-       $(top_srcdir)/idl/Accessibility_Hyperlink.idl           \
-       $(top_srcdir)/idl/Accessibility_Hypertext.idl           \
-       $(top_srcdir)/idl/Accessibility_Image.idl               \
-       $(top_srcdir)/idl/Accessibility_Registry.idl            \
-       $(top_srcdir)/idl/Accessibility_Relation.idl            \
-       $(top_srcdir)/idl/Accessibility_Role.idl                \
-       $(top_srcdir)/idl/Accessibility_Selection.idl           \
-       $(top_srcdir)/idl/Accessibility_State.idl               \
-       $(top_srcdir)/idl/Accessibility_StreamableContent.idl   \
-       $(top_srcdir)/idl/Accessibility_Table.idl               \
-       $(top_srcdir)/idl/Accessibility_Text.idl                \
-       $(top_srcdir)/idl/Accessibility_Value.idl
-
-
-BUILT_SOURCES = $(IDL_OUT) Accessibility-imodule.c
-CLEANFILES = $(IDL_OUT) Accessibility-imodule.c
+BUILT_SOURCES = Accessibility.h
+CLEANFILES = Accessibility.h
 
 libspi_la_SOURCES =            \
-       $(IDL_OUT)              \
+       Accessibility.h         \
        accessible.c            \
-       action.c                \
+       action.c                \
        application.c           \
-       base.c                  \
        component.c             \
+       dbus.c                  \
+       document.c              \
+       droute.c                \
        editabletext.c          \
        hyperlink.c             \
        hypertext.c             \
        image.c                 \
-       devicelistener.c        \
-       relation.c              \
-       remoteobject.c          \
        selection.c             \
-       spi-private.h           \
-       streamablecontent.c     \
-       stateset.c              \
        table.c                 \
        text.c                  \
-       util.c                  \
-       value.c                 \
-       listener.c              \
-       eventlistener.c 
-
-$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h
-
-IDLFLAGS = -I$(BONOBO_ACTIVATION_IDL_DIR) \
-          -I$(LIBBONOBO_IDL_DIR)         \
-          -I$(top_srcdir)/idl            \
-          --add-imodule
-
-$(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL)
-       $(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl
-
-orbittypelibdir = $(libdir)/orbit-2.0
-orbittypelib_LTLIBRARIES = Accessibility_module.la
-
-Accessibility_module_la_LDFLAGS = \
-       -export-dynamic -module -avoid-version -no-undefined
-
-Accessibility_module_la_LIBADD = \
-       $(ORBIT_LIBS)
+       tree.c                  \
+       util.c \
+       value.c                 \
+       introspect-loader.c     \
+       introspectable.c 
 
-Accessibility_module_la_SOURCES = \
-       Accessibility-imodule.c
+Accessibility.h: ../xml/spec.xml ../tools/c-constants-generator.xsl
+       xsltproc --stringparam mixed-case-prefix Accessibility_ ../tools/c-constants-generator.xsl $< >$@
 
-DONT_DIST_SOURCE = $(IDL_OUT) Accessibility-imodule.c
+DONT_DIST_SOURCE = Accessibility.h
 
 dist-hook:
        for file in $(DONT_DIST_SOURCE) ; do \