From 2db06dbf189cfd4e852b93db120cafaf717b0784 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Wed, 11 Oct 2006 17:30:58 +0000 Subject: * test/name-test/Makefile.am: don't link against both libdbus and libdbus-convenience --- ChangeLog | 5 +++++ test/name-test/Makefile.am | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a259658..090b37ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-11 John (J5) Palmieri + + * test/name-test/Makefile.am: don't link against both libdbus and + libdbus-convenience + 2006-10-11 John (J5) Palmieri * configure.in: check for dirfd even if it is a macro diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 75b20377..ea35bc73 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -21,19 +21,19 @@ noinst_PROGRAMS=test-names test-pending-call-dispatch test-threads-init test_names_SOURCES= \ test-names.c -test_names_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la +test_names_LDADD=$(top_builddir)/dbus/libdbus-convenience.la test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_pending_call_dispatch_SOURCES = \ test-pending-call-dispatch.c -test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la +test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la test_pending_call_dispatch_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_threads_init_SOURCES = \ test-threads-init.c -test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la +test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-convenience.la test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@ endif -- cgit