[at-spi2-core/wip/meson: 9/15] build: Ensure that libatspi depends on libdbind
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core/wip/meson: 9/15] build: Ensure that libatspi depends on libdbind
- Date: Wed, 24 May 2017 13:19:31 +0000 (UTC)
commit 1d554fa56dcadd50a76ad589190d74e2bdda1d1a
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed May 24 12:20:00 2017 +0100
build: Ensure that libatspi depends on libdbind
With heavy parallelisation we may end up in a case where libatspi is
built before libdbind.
atspi/Makefile.am | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/atspi/Makefile.am b/atspi/Makefile.am
index ab6c448..5267f47 100644
--- 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) \
$(X11_LIBS) \
$(top_builddir)/dbind/libdbind.la
+libatspi_la_DEPENDENCIES = $(top_builddir)/dbind/libdbind.la
+
libatspiincludedir = $(includedir)/at-spi-2.0/atspi
libatspiinclude_HEADERS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]