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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6b74d4b..fabb7d7 100644 (file)
--- 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 =                           \