diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-10-11 17:30:58 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-10-11 17:30:58 +0000 |
| commit | 2db06dbf189cfd4e852b93db120cafaf717b0784 (patch) | |
| tree | 2806dc8aa34c5739f3610d8a7d0ac114c7613754 | |
| parent | 77aab542eb3d339d57630eb7747f354f38563efe (diff) | |
* test/name-test/Makefile.am: don't link against both libdbus and
libdbus-convenience
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/name-test/Makefile.am | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,10 @@ 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 (Patch from Timothy Redaelli <drizzt at gufi dot org>) 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 |