Fix link order: system libraries should come after libdbus-convenience

libdbus-convenience may use system libraries, but not the other way
round. Most platforms don't care, but on some platforms this means that
system libraries need to be listed after libdbus-convenience.la on the
link line.

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 3b4f69d..ad49e6d 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -78,8 +78,8 @@ dbus_daemon_SOURCES=                          \
 
 dbus_daemon_LDADD=                                     \
        $(EFENCE)                                       \
-       $(DBUS_BUS_LIBS)                                \
-       $(top_builddir)/dbus/libdbus-convenience.la
+       $(top_builddir)/dbus/libdbus-convenience.la     \
+       $(DBUS_BUS_LIBS)
 
 dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
 
@@ -103,8 +103,8 @@ dbus_daemon_launch_helper_SOURCES=          \
        $(LAUNCH_HELPER_SOURCES)
 
 dbus_daemon_launch_helper_LDADD=               \
-       $(DBUS_LAUNCHER_LIBS)                   \
-       $(top_builddir)/dbus/libdbus-convenience.la
+       $(top_builddir)/dbus/libdbus-convenience.la \
+       $(DBUS_LAUNCHER_LIBS)
 
 dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
 
@@ -115,8 +115,8 @@ dbus_daemon_launch_helper_test_SOURCES=             \
        $(LAUNCH_HELPER_SOURCES)
 
 dbus_daemon_launch_helper_test_LDADD=          \
-       $(DBUS_LAUNCHER_LIBS)                   \
-       $(top_builddir)/dbus/libdbus-convenience.la
+       $(top_builddir)/dbus/libdbus-convenience.la \
+       $(DBUS_LAUNCHER_LIBS)
 
 dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
 dbus_daemon_launch_helper_test_CPPFLAGS=       \
@@ -129,8 +129,8 @@ bus_test_launch_helper_SOURCES=             \
        $(LAUNCH_HELPER_SOURCES)
 
 bus_test_launch_helper_LDADD=          \
-       $(DBUS_LAUNCHER_LIBS)                   \
-       $(top_builddir)/dbus/libdbus-convenience.la
+       $(top_builddir)/dbus/libdbus-convenience.la \
+       $(DBUS_LAUNCHER_LIBS)
 
 bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
 bus_test_launch_helper_CPPFLAGS=       \

diff --git a/test/Makefile.am b/test/Makefile.am
index a7f0597..c759906 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -61,7 +61,7 @@ test_sleep_forever_SOURCES =                  \
 decode_gcov_SOURCES=                           \
        decode-gcov.c
 
-TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
+TEST_LIBS=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS)
 
 test_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
 test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@