From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Tue, 9 Jun 2009 11:52:05 +0000 (+1000)
Subject: remove dbus-uuidgen from Windows build (cherry picked from commit 73873e002ac9ba61593... 
X-Git-Tag: dbus-1.3.1~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c02c626217f68e4ddbd04481ebcd84c531ab000;p=thirdparty%2Fdbus.git

remove dbus-uuidgen from Windows build (cherry picked from commit 73873e002ac9ba6159388b2c7b4190c30961ec68)
---

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 9daa8a9c8..4dc53e35a 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -71,6 +71,8 @@ DBUS_UTIL_arch_sources =			\
 	dbus-spawn-win.c
 else
 DBUS_LIB_arch_sources = 			\
+	dbus-uuidgen.c				\
+	dbus-uuidgen.h				\
 	dbus-server-unix.c 			\
 	dbus-server-unix.h
 
@@ -165,8 +167,6 @@ DBUS_LIB_SOURCES=				\
 	dbus-transport-protected.h		\
 	dbus-transport-socket.c			\
 	dbus-transport-socket.h			\
-	dbus-uuidgen.c				\
-	dbus-uuidgen.h				\
 	dbus-watch.c				\
 	dbus-watch.h
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f597d59e7..08b5d6a51 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
+extra_bin_programs += dbus-launch dbus-cleanup-sockets dbus-uuidgen
 endif
 
-bin_PROGRAMS=dbus-send dbus-monitor $(extra_bin_programs) dbus-uuidgen
+bin_PROGRAMS=dbus-send dbus-monitor $(extra_bin_programs)
 
 dbus_send_SOURCES=				\
 	dbus-print-message.c			\