From 274e0fbc20a9639201c64830c7eca7a5cea97e73 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 15 Jun 2011 11:50:33 +0100 Subject: Simplify linking for tests that use libdbus-testutils This is the library used by tests that link libdbus-internal and DBusLoop. By linking libdbus-internal into it, we can avoid having to repeat that dependency all over the place - libtool and cmake both know how to follow recursive dependencies. In cmake, also use libdbus-testutils for more tests, in preference to repeating its source files. --- test/name-test/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/name-test') diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 226a2b74..f4754f39 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -46,24 +46,24 @@ test_shutdown_SOURCES = \ test-shutdown.c test_shutdown_CFLAGS= -test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la +test_shutdown_LDADD=../libdbus-testutils.la test_privserver_SOURCES = \ test-privserver.c test_privserver_CFLAGS= -test_privserver_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la +test_privserver_LDADD=../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 +test_privserver_client_LDADD=../libdbus-testutils.la test_autolaunch_SOURCES = \ test-autolaunch.c test_autolaunch_CFLAGS= -test_autolaunch_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la +test_autolaunch_LDADD=../libdbus-testutils.la endif -- cgit v1.2.1