From: Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
Date: Thu, 11 Feb 2010 16:04:10 +0000 (+0100)
Subject: Enable dbus-launch for Windows target.
X-Git-Tag: dbus-1.3.1~119^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f31bb2a749f4206ead8e80e7868f2f5f45a83b36;p=thirdparty%2Fdbus.git

Enable dbus-launch for Windows target.
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9cf3d721a..906d12947 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,10 +4,10 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR
 
 extra_bin_programs=
 if DBUS_UNIX
-extra_bin_programs += dbus-launch dbus-cleanup-sockets dbus-uuidgen
+extra_bin_programs += dbus-cleanup-sockets dbus-uuidgen
 endif
 
-bin_PROGRAMS=dbus-send dbus-monitor $(extra_bin_programs)
+bin_PROGRAMS=dbus-launch dbus-send dbus-monitor $(extra_bin_programs)
 
 dbus_send_SOURCES=				\
 	dbus-print-message.c			\
@@ -19,10 +19,16 @@ 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-x11.c			\
 	dbus-launch.h
+endif
 
 dbus_cleanup_sockets_SOURCES=			\
 	dbus-cleanup-sockets.c