diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-15 10:34:49 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:07:51 +0100 |
| commit | 94a061d1b13267bd21a9c1c18b2e7da318fe448f (patch) | |
| tree | c4b9e2bfc968090e381a285139b1af30244e5dd3 | |
| parent | b643d18a36de5b23747e4b4f37de0961a2477a41 (diff) | |
| download | dbus-94a061d1b13267bd21a9c1c18b2e7da318fe448f.tar.gz | |
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
| -rw-r--r-- | tools/Makefile.am | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 6b74d4bb..fabb7d73 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 = \ |