Build fixes.

[platform/upstream/at-spi2-core.git] / atspi / Makefile.am

diff --git a/atspi/Makefile.am b/atspi/Makefile.am
index 4d0989a..8a26430 100644 (file)
--- a/atspi/Makefile.am
+++ b/atspi/Makefile.am
@@ -2,41 +2,105 @@ lib_LTLIBRARIES = libatspi.la
 
 libatspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@ -no-undefined
 
-libatspi_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
+libatspi_la_CFLAGS = $(DBUS_CFLAGS) \
                    $(DBIND_CFLAGS)     \
+                   $(GLIB_CFLAGS)     \
+                   -I$(top_srcdir)/registryd \
                     -I$(top_srcdir)
 
-libatspi_la_LIBADD = $(DBUS_GLIB_LIBS) \
+libatspi_la_LIBADD = $(DBUS_LIBS) \
+       $(GOBJ_LIBS) \
        $(X_LIBS) \
        $(top_builddir)/dbind/libdbind.la
 
-libatspidir = $(includedir)/at-spi-1.0/atspi
+libatspiincludedir = $(includedir)/at-spi-2.0/atspi
+
+libatspiinclude_HEADERS = \
+       atspi.h \
+       atspi-accessible.h \
+       atspi-action.h \
+       atspi-application.h \
+       atspi-collection.h \
+       atspi-component.h \
+       atspi-constants.h \
+       atspi-device-listener.h \
+       atspi-device-listener-private.h \
+       atspi-document.h \
+       atspi-editabletext.h \
+       atspi-event-listener.h \
+       atspi-event-listener-private.h \
+atspi-gmain.c \
+atspi-gmain.h \
+       atspi-hyperlink.h \
+       atspi-hypertext.h \
+       atspi-image.h \
+       atspi-matchrule.h \
+       atspi-misc.h \
+       atspi-object.h \
+       atspi-private.h \
+       atspi-registry.h \
+       atspi-relation.h \
+       atspi-selection.h \
+       atspi-stateset.h \
+       atspi-table.h \
+       atspi-text.h \
+       atspi-types.h \
+       atspi-value.h
 
 libatspi_la_SOURCES =          \
-       atspi.h                 \
+       $(libatspiinclude_HEADERS) \
+       atspi.h \
        atspi-accessible.c \
        atspi-accessible.h \
+       atspi-action.c \
+       atspi-action.h \
        atspi-application.c \
        atspi-application.h \
+       atspi-collection.c \
+       atspi-collection.h \
        atspi-component.c \
        atspi-component.h \
        atspi-constants.h \
-       atspi-event-types.h \
        atspi-device-listener.c \
        atspi-device-listener.h \
        atspi-device-listener-private.h \
+       atspi-document.c \
+       atspi-document.h \
+       atspi-editabletext.c \
+       atspi-editabletext.h \
        atspi-event-listener.c \
        atspi-event-listener.h \
        atspi-event-listener-private.h \
+       atspi-hyperlink.c \
+       atspi-hyperlink.h \
+       atspi-hypertext.c \
+       atspi-hypertext.h \
+       atspi-image.c \
+       atspi-image.h \
+       atspi-matchrule.c \
+       atspi-matchrule.h \
+       atspi-matchrule-private.h \
        atspi-misc.c \
        atspi-misc.h \
        atspi-misc-private.h \
+       atspi-object.c \
+       atspi-object.h \
        atspi-private.h \
        atspi-registry.c \
        atspi-registry.h \
+       atspi-relation.c \
+       atspi-relation.h \
+       atspi-selection.c \
+       atspi-selection.h \
        atspi-stateset.c \
        atspi-stateset.h \
-       atspi-types.h
+       atspi-table.c \
+       atspi-table.h \
+       atspi-text.c \
+       atspi-text.h \
+       atspi-types.h \
+       atspi-value.c \
+       atspi-value.h
 
 #BUILT_SOURCES = atspi-constants.h
 
@@ -61,10 +125,10 @@ Atspi-2.0.gir: $(INTROSPECTION_SCANNER) \
                --libtool="$(top_builddir)/libtool" \
                --library=libatspi.la \
                --library=$(top_builddir)/dbind/libdbind.la \
-               --pkg dbus-glib-1 \
+               --pkg dbus-1 \
                --warn-all \
                --output $@ \
-               $(INTROSPECTION_FILES)
+               $(addprefix $(srcdir)/, $(INTROSPECTION_FILES))
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = Atspi-2.0.gir