From 0b531d9f083d9915711d064b55d0c95727d5981d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 27 Aug 2013 13:16:51 +0100 Subject: [PATCH] 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. --- dbus/Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- 1.8.4.rc3