From: Marc Mutz Date: Tue, 21 Apr 2009 10:33:50 +0000 (+0200) Subject: Makefile.am's: reorder libraries so static libs come first (fixes linking on W32... X-Git-Tag: dbus-1.3.1~184 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a871d0f42e472d83f30faecb8f1840c3bac26ae6;p=thirdparty%2Fdbus.git Makefile.am's: reorder libraries so static libs come first (fixes linking on W32) (cherry picked from commit f88bd88d6b4b318f9401fae595343c8b1bacf654) --- diff --git a/bus/Makefile.am b/bus/Makefile.am index 3b4f69db6..496e286e3 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -77,9 +77,9 @@ dbus_daemon_SOURCES= \ main.c dbus_daemon_LDADD= \ + $(top_builddir)/dbus/libdbus-convenience.la \ $(EFENCE) \ - $(DBUS_BUS_LIBS) \ - $(top_builddir)/dbus/libdbus-convenience.la + $(DBUS_BUS_LIBS) dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ diff --git a/test/Makefile.am b/test/Makefile.am index a7f05970f..ead399b63 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -61,17 +61,17 @@ 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_LDADD=libdbus-testutils.la $(TEST_LIBS) test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@ -test_names_LDADD=$(TEST_LIBS) libdbus-testutils.la +test_names_LDADD=libdbus-testutils.la $(TEST_LIBS) test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@ ## break_loader_LDADD= $(TEST_LIBS) ## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@ -test_shell_service_LDADD=$(TEST_LIBS) libdbus-testutils.la +test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS) test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@ -shell_test_LDADD=$(TEST_LIBS) libdbus-testutils.la +shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS) shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ spawn_test_LDADD=$(TEST_LIBS) spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@