X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2FMakefile.am;h=08b5d6a51d45953d71bf4a58c51181077597a61b;hb=4c02c626217f68e4ddbd04481ebcd84c531ab000;hp=71db5203f94a4784a8fa0c96fe57b70543dbfc0f;hpb=beb9cd2eb219e04f9872c6a4dd743d5d1c36b4b1;p=platform%2Fupstream%2Fdbus.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 71db520..08b5d6a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,37 +1,13 @@
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION
+configdir=$(sysconfdir)/dbus-1
 
-if HAVE_GLIB
-GLIB_TOOLS=dbus-monitor
+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"\"
 
-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 --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
-
-BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
-
-else
-GLIB_TOOLS=
+extra_bin_programs=
+if DBUS_UNIX
+extra_bin_programs += dbus-launch dbus-cleanup-sockets dbus-uuidgen
 endif
 
-if HAVE_GTK
-GTK_TOOLS=dbus-viewer
-else
-GTK_TOOLS=
-endif
-
-if HAVE_GLIB
-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
-endif
-
-bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
+bin_PROGRAMS=dbus-send dbus-monitor $(extra_bin_programs)
 
 dbus_send_SOURCES=				\
 	dbus-print-message.c			\
@@ -44,26 +20,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_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_monitor_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+dbus_monitor_LDFLAGS=@R_DYNAMIC_LDFLAG@
 
-man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
+dbus_uuidgen_LDADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_CLIENT_LIBS)
+dbus_uuidgen_LDFLAGS=@R_DYNAMIC_LDFLAG@
+
+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	\
-	dbus-bus-introspect.xml		\
-	dbus-glib-bindings.h
+	run-with-tmp-session-bus.conf
+
+#create the /var/lib/data directory for dbus-uuidgen
+localstatelibdir = $(localstatedir)/lib/dbus
+localstatelib_DATA =