diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-27 13:16:51 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-21 12:22:16 +0100 |
| commit | 725105b4534e90db01adc7cddc88420a419333fd (patch) | |
| tree | c9855e52b6e4d0abcc2a3ac31c01576f5af43450 | |
| parent | a466946c5ef882ff4710c624b2f33b3ff81a5ea9 (diff) | |
| download | dbus-glib-725105b4534e90db01adc7cddc88420a419333fd.tar.gz | |
Avoid underlinking internal library libdbus-gtool.la
Anything that links libdbus-gtool needs to pull in GLib/GObject,
and the order matters (things that libdbus-gtool depends on must
appear after libdbus-gtool itself). libtool understands this, but
only if you tell it the full dependencies.
This broke compilation of test-dbus-glib.exe when cross-compiling
for 32-bit Windows with mingw-w64 (GNU tuple: i686-w64-mingw32).
The linking order used here for dependencies is "lowest in the stack
first", as recommended by the GStreamer documentation.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68601
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | dbus/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index b865286..6d885f9 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -63,7 +63,12 @@ libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \ dbus-gparser.c \ dbus-gparser.h -libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -lexpat +libdbus_gtool_la_LIBADD = \ + -lexpat \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + libdbus-glib-1.la \ + $(NULL) bin_PROGRAMS=dbus-binding-tool |