Print all-printable-ASCII byte arrays as strings

[platform/upstream/dbus.git] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 7cc6cad..9fad7a7 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,18 +1,8 @@
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
+configdir=$(sysconfdir)/dbus-1
 
-if HAVE_GLIB
-GLIB_TOOLS=dbus-monitor
-else
-GLIB_TOOLS=
-endif
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
 
-if HAVE_GTK
-GTK_TOOLS=dbus-viewer
-else
-GTK_TOOLS=
-endif
-
-bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
+bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets dbus-uuidgen
 
 dbus_send_SOURCES=                             \
        dbus-print-message.c                    \
@@ -25,24 +15,33 @@ dbus_monitor_SOURCES=                               \
        dbus-print-message.h
 
 dbus_launch_SOURCES=                           \
-       dbus-launch.c
+       dbus-launch.c                           \
+       dbus-launch-x11.c                       \
+       dbus-launch.h
 
 dbus_cleanup_sockets_SOURCES=                  \
        dbus-cleanup-sockets.c
 
-dbus_viewer_SOURCES=                           \
-       dbus-names-model.c                      \
-       dbus-names-model.h                      \
-       dbus-tree-view.c                        \
-       dbus-tree-view.h                        \
-       dbus-viewer.c
+dbus_uuidgen_SOURCES=                          \
+       dbus-uuidgen.c
+
+dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+dbus_send_LDFLAGS=@R_DYNAMIC_LDFLAG@
+
+dbus_monitor_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+dbus_monitor_LDFLAGS=@R_DYNAMIC_LDFLAG@
 
-dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
-dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
-dbus_launch_LDADD= $(DBUS_X_LIBS)
-dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS)
+dbus_uuidgen_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+dbus_uuidgen_LDFLAGS=@R_DYNAMIC_LDFLAG@
 
-man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
-EXTRA_DIST = $(man_MANS)
+dbus_launch_LDADD= $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS)
+dbus_launch_LDFLAGS=@R_DYNAMIC_LDFLAG@
 
+man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1
+EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
+CLEANFILES =                           \
+       run-with-tmp-session-bus.conf
 
+#create the /var/lib/data directory for dbus-uuidgen
+localstatelibdir = $(localstatedir)/lib/dbus
+localstatelib_DATA =