[daemon-fix] Registering starters: unwanted release_kdbus_name when no error was...

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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 08b9023..73d95fc 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,6 +2,7 @@ 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"\" \
@@ -19,6 +20,7 @@ bin_PROGRAMS = \
 if DBUS_UNIX
 bin_PROGRAMS += \
        dbus-cleanup-sockets \
+       dbus-run-session \
        dbus-uuidgen \
        $(NULL)
 endif
@@ -42,6 +44,13 @@ dbus_launch_SOURCES=                         \
        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=                  \
@@ -71,6 +80,9 @@ EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c
 CLEANFILES =                           \
        run-with-tmp-session-bus.conf
 
-#create the /var/lib/data directory for dbus-uuidgen
-localstatelibdir = $(localstatedir)/lib/dbus
-localstatelib_DATA =
+# 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