[gtk+/quartz-integration: 96/108] Bypass libtool for linking with libuuid on win32

[John Ralls <jralls src gnome org>]

commit 41321cd2051508117456c06a343df4d4fd909151
Author: Arnel Borja <galeon ymail com>
Date:   Sun May 1 08:13:45 2011 +0300

    Bypass libtool for linking with libuuid on win32
    
    Fixes a regression introduced in 07d49ee5.
    
    Libtool by default refuses to link static libraries into shared
    libraries. In Windows, libuuid is however a static library and needed
    for shared libgtk; as a work around, use "-Wl,-luuid" to pass the option
    directly to the linker.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=642214

 gtk/Makefile.am |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 23c7355..b412553 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -891,10 +891,9 @@ libgtk_3_la_LDFLAGS = $(libtool_opts)
 libgtk_3_la_LIBADD = $(libadd)
 libgtk_3_la_DEPENDENCIES = $(deps)
 
-#libgtk_win32_3_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
-
 if USE_WIN32
-libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
+libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_3_la_LDFLAGS += -Wl,-luuid
 libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif