remove dbus-uuidgen from Windows build (cherry picked from commit 73873e002ac9ba61593...

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 9daa8a9..4dc53e3 100644 (file)
--- 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 f597d59..08b5d6a 100644 (file)
--- 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                    \