diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-15 11:41:27 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:16:44 +0100 |
commit | f7b7de3bb14d29ab02d1e713036467adc6b9cb56 (patch) | |
tree | 23f3b012ac40002b0ef0d11230d66a1b37268ad2 /test | |
parent | 42d7a573cff2febb9938e30edcebc420e0f40195 (diff) | |
download | dbus-f7b7de3bb14d29ab02d1e713036467adc6b9cb56.tar.gz |
Don't explicitly link thread and network libs into various tests
These tests get everything they need from the public or internal API of
libdbus-internal.la, and libtool knows how to pull in libraries'
dependencies, so we don't need explicit linking.
spawn-test and break-loader don't actually need test-utils.[ch]
either.
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.am | 15 | ||||
-rw-r--r-- | test/name-test/Makefile.am | 16 |
2 files changed, 15 insertions, 16 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 36feca1e..ad8b6a1c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -85,14 +85,13 @@ test_sleep_forever_SOURCES = \ # This assumes that most tests will be linked to libdbus-internal; # tests linked to only the public libdbus have their own CPPFLAGS. AM_CPPFLAGS=-DDBUS_STATIC_BUILD -TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) - -test_service_LDADD=libdbus-testutils.la $(TEST_LIBS) -test_names_LDADD=libdbus-testutils.la $(TEST_LIBS) -## break_loader_LDADD= $(TEST_LIBS) -test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS) -shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS) -spawn_test_LDADD=$(TEST_LIBS) + +test_service_LDADD = libdbus-testutils.la $(top_builddir)/dbus/libdbus-internal.la +test_names_LDADD = libdbus-testutils.la $(top_builddir)/dbus/libdbus-internal.la +## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la +test_shell_service_LDADD = libdbus-testutils.la $(top_builddir)/dbus/libdbus-internal.la +shell_test_LDADD = libdbus-testutils.la $(top_builddir)/dbus/libdbus-internal.la +spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la EXTRA_DIST = dbus-test-runner diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 46ad3c3b..226a2b74 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -25,45 +25,45 @@ AM_CPPFLAGS = -DDBUS_STATIC_BUILD test_pending_call_dispatch_SOURCES = \ test-pending-call-dispatch.c -test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) +test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-internal.la test_pending_call_timeout_SOURCES = \ test-pending-call-timeout.c -test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) +test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-internal.la test_threads_init_SOURCES = \ test-threads-init.c -test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) +test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-internal.la test_ids_SOURCES = \ test-ids.c -test_ids_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) +test_ids_LDADD=$(top_builddir)/dbus/libdbus-internal.la test_shutdown_SOURCES = \ test-shutdown.c test_shutdown_CFLAGS= -test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la test_privserver_SOURCES = \ test-privserver.c test_privserver_CFLAGS= -test_privserver_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_privserver_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la test_privserver_client_SOURCES = \ test-privserver-client.c test_privserver_client_CFLAGS= -test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la test_autolaunch_SOURCES = \ test-autolaunch.c test_autolaunch_CFLAGS= -test_autolaunch_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_autolaunch_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la endif |