X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2FMakefile.am;h=73d95fcfce3a4adeba9607c750396a5102e55144;hb=7d9239c9c78cb6d0b9c282376fcf3cda1de23209;hp=d1b490c7b72a18772a90f56aaa45b6fde24db86b;hpb=6eab51411982fc61c193caed388608c4f2bd25d1;p=platform%2Fupstream%2Fdbus.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index d1b490c..73d95fc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,36 +1,30 @@
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-
-if HAVE_GLIB
-GLIB_TOOLS=dbus-monitor
-
-nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
-libdbus_glibdir = $(includedir)/dbus-1.0/dbus
-
-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool
-	$(top_builddir)/glib/dbus-binding-tool --ignore-unsupported --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml # FIXME - remove --ignore-unsupported when we can do arrays
-
-BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
-
-else
-GLIB_TOOLS=
+configdir=$(sysconfdir)/dbus-1
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(DBUS_STATIC_BUILD_CPPFLAGS) \
+	$(DBUS_X_CFLAGS) \
+	-DDBUS_COMPILATION \
+	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+	$(NULL)
+
+# 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-run-session \
+	dbus-uuidgen \
+	$(NULL)
 endif
 
-if HAVE_GTK
-GTK_TOOLS=dbus-viewer
-else
-GTK_TOOLS=
-endif
-
-noinst_PROGRAMS = print-introspect
-
-print_introspect_SOURCES = print-introspect.c
-print_introspect_LDADD = $(top_builddir)/glib/libdbus-glib-1.la
-
-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon dbus-launch print-introspect $(top_builddir)/bus/dbus-daemon
-	DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./print-introspect org.freedesktop.DBus /org/freedesktop/DBus > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
-
-bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
-
 dbus_send_SOURCES=				\
 	dbus-print-message.c			\
 	dbus-print-message.h			\
@@ -41,27 +35,54 @@ dbus_monitor_SOURCES=				\
 	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
+
+dbus_run_session_SOURCES =			\
+	dbus-run-session.c
+
+dbus_run_session_LDADD = \
+	$(top_builddir)/dbus/libdbus-1.la \
+	$(NULL)
+endif
 
 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_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_send_LDADD = \
+	$(top_builddir)/dbus/libdbus-1.la \
+	$(NULL)
 
-man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
-EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
+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)
+
+EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c
 CLEANFILES = 				\
-	run-with-tmp-session-bus.conf	\
-	dbus-bus-introspect.xml		\
-	dbus-glib-bindings.h
+	run-with-tmp-session-bus.conf
+
+# create the /var/lib/dbus directory for dbus-uuidgen
+install-data-local:
+	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus
+
+installcheck-local:
+	test -d $(DESTDIR)$(localstatedir)/lib/dbus