fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-01 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile.am's: reorder libraries so static libs come first (fixes linking on W32) (cherry picked from commit f88bd88d6b4b318f9401fae595343c8b1bacf654)

Browse source
This commit is contained in:
Marc Mutz 2009-04-21 12:33:50 +02:00 • committed by Ralf Habacker
parent 5a0a3b4451
commit a871d0f42e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bus/Makefile.am
View file

@ -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@

10
test/Makefile.am
View file

@ -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@