From 94a061d1b13267bd21a9c1c18b2e7da318fe448f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 15 Jun 2011 10:34:49 +0100 Subject: [PATCH] tools: simplify linking * dbus-send, dbus-uuidgen only need to link libdbus; libtool knows what extra libraries libdbus depends on * dbus-monitor uses a Winsock header (on Windows) so it needs NETWORK_libs,but still doesn't need threads * dbus-launch needs X (on Unix) but doesn't directly need threads or networking --- tools/Makefile.am | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 6b74d4b..fabb7d7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -45,13 +45,22 @@ dbus_cleanup_sockets_SOURCES= \ dbus_uuidgen_SOURCES= \ dbus-uuidgen.c -dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS) +dbus_send_LDADD = \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NULL) -dbus_monitor_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS) +dbus_monitor_LDADD = \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NETWORK_libs) \ + $(NULL) -dbus_uuidgen_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS) +dbus_uuidgen_LDADD = \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NULL) -dbus_launch_LDADD= $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS) +dbus_launch_LDADD = \ + $(DBUS_X_LIBS) \ + $(NULL) EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c CLEANFILES = \ -- 2.7.4