From: John (J5) Palmieri <johnp@redhat.com>
Date: Wed, 11 Oct 2006 17:30:58 +0000 (+0000)
Subject: * test/name-test/Makefile.am: don't link against both libdbus and
X-Git-Tag: dbus-0.94~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2db06dbf189cfd4e852b93db120cafaf717b0784;p=thirdparty%2Fdbus.git

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

diff --git a/ChangeLog b/ChangeLog
index 5a2596584..090b37fff 100644
--- 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 75b20377c..ea35bc732 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