-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS)
+configdir=$(sysconfdir)/dbus-1
-if HAVE_GLIB
-GLIB_TOOLS=dbus-monitor
-else
-GLIB_TOOLS=
-endif
+INCLUDES=-I$(top_srcdir) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
-bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch
+# if assertions are enabled, improve backtraces
+AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
+
+bin_PROGRAMS = \
+ dbus-launch \
+ dbus-monitor \
+ dbus-send \
+ $(NULL)
+
+if DBUS_UNIX
+bin_PROGRAMS += \
+ dbus-cleanup-sockets \
+ dbus-uuidgen \
+ $(NULL)
+endif
dbus_send_SOURCES= \
dbus-print-message.c \
dbus-print-message.c \
dbus-print-message.h
+if DBUS_WIN
+dbus_launch_SOURCES= \
+ dbus-launch-win.c \
+ dbus-launch.h
+else
dbus_launch_SOURCES= \
- dbus-launch.c
+ dbus-launch.c \
+ dbus-launch-x11.c \
+ dbus-launch.h
+endif
+
+dbus_cleanup_sockets_SOURCES= \
+ dbus-cleanup-sockets.c
+
+dbus_uuidgen_SOURCES= \
+ dbus-uuidgen.c
+
+dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+
+dbus_monitor_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+
+dbus_uuidgen_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+
+dbus_launch_LDADD= $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS)
-dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
-dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
-## dbus-launch doesn't link to anything
-dbus_launch_LDADD= $(DBUS_X_LIBS)
+EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c
+CLEANFILES = \
+ run-with-tmp-session-bus.conf
-man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1
-EXTRA_DIST = $(man_MANS)
+#create the /var/lib/data directory for dbus-uuidgen
+localstatelibdir = $(localstatedir)/lib/dbus
+localstatelib_DATA =