build: Ensure that libatspi depends on libdbind

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

diff --git a/atspi/Makefile.am b/atspi/Makefile.am
index bc35166..5267f47 100644 (file)
--- a/atspi/Makefile.am
+++ b/atspi/Makefile.am
@@ -2,19 +2,23 @@ lib_LTLIBRARIES = libatspi.la
 
 libatspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@ -no-undefined
 
-libatspi_la_CFLAGS = $(DBUS_CFLAGS) \
-                   $(DBIND_CFLAGS)     \
-                   $(GLIB_CFLAGS)     \
-                   -I$(top_srcdir)/registryd \
-                   -I$(top_builddir)/registryd \
-                    -I$(top_builddir) \
-                    -I$(top_srcdir)
-
-libatspi_la_LIBADD = $(DBUS_LIBS) \
+libatspi_la_CFLAGS = \
+       $(DBUS_CFLAGS) \
+       $(DBIND_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       -I$(top_srcdir)/registryd \
+       -I$(top_builddir)/registryd \
+       -I$(top_builddir) \
+       -I$(top_srcdir)
+
+libatspi_la_LIBADD = \
+       $(DBUS_LIBS) \
        $(GOBJ_LIBS) \
-       $(X_LIBS) \
+       $(X11_LIBS) \
        $(top_builddir)/dbind/libdbind.la
 
+libatspi_la_DEPENDENCIES = $(top_builddir)/dbind/libdbind.la
+
 libatspiincludedir = $(includedir)/at-spi-2.0/atspi
 
 libatspiinclude_HEADERS = \
@@ -46,6 +50,7 @@ atspi-gmain.h \
        atspi-selection.h \
        atspi-stateset.h \
        atspi-table.h \
+       atspi-table-cell.h \
        atspi-text.h \
        atspi-types.h \
        atspi-value.h
@@ -100,6 +105,7 @@ libatspi_la_SOURCES =               \
        atspi-stateset.c \
        atspi-stateset.h \
        atspi-table.c \
+       atspi-table-cell.c \
        atspi-table.h \
        atspi-text.c \
        atspi-text.h \
@@ -158,3 +164,5 @@ CLEANFILES = \
     $(typelib_DATA)
 
 endif
+
+-include $(top_srcdir)/git.mk