X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2FMakefile.am;h=08b902347a4f864ddeb1b941dc08f3d57e7999ca;hb=e3c12a86d6bea9e212c58ddbf3dc4640b74f9021;hp=868b50283ecc05498e36bd28bca8c7d2f44f5bf5;hpb=24373ede7cad885f67fabafc781f8524459fc475;p=platform%2Fupstream%2Fdbus.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 868b502..08b9023 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,21 +1,76 @@
-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
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(DBUS_X_CFLAGS) \
+	-DDBUS_COMPILATION \
+	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+	$(NULL)
 
-bin_PROGRAMS=dbus-send $(GLIB_TOOLS)
+# 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.h			\
 	dbus-send.c
 
 dbus_monitor_SOURCES=				\
-	dbus-monitor.c
+	dbus-monitor.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-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 \
+	$(NULL)
+
+dbus_monitor_LDADD = \
+	$(top_builddir)/dbus/libdbus-1.la \
+	$(NETWORK_libs) \
+	$(NULL)
+
+dbus_uuidgen_LDADD = \
+	$(top_builddir)/dbus/libdbus-1.la \
+	$(NULL)
+
+dbus_launch_LDADD = \
+	$(DBUS_X_LIBS) \
+	$(NULL)
 
-dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
-dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
+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
-EXTRA_DIST = $(man_MANS)
+#create the /var/lib/data directory for dbus-uuidgen
+localstatelibdir = $(localstatedir)/lib/dbus
+localstatelib_DATA =