* test/name-test/Makefile.am: don't link against both libdbus and

  libdbus-convenience

diff --git a/ChangeLog b/ChangeLog
index 5a2596584e06f39d0cfadffbedfb14bb7a6b4b72..090b37fffd52ee0f212e0cf7da62023437b9d3a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-11  John (J5) Palmieri  <johnp@redhat.com>
+
+       * test/name-test/Makefile.am: don't link against both libdbus and
+       libdbus-convenience
+
 2006-10-11  John (J5) Palmieri  <johnp@redhat.com>
 
        * 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 75b20377ccb20d658173bd7a747644008a71ad2b..ea35bc7323b2482a18cd9a13d4e0ea028840c6c5 100644 (file)
--- 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