From 5c6180b9a0153e67118243ca6f69ac2dc211bf53 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 17 Oct 2007 16:30:17 +0000 Subject: [PATCH] Use -Wl,-luuid instead of -luuid to work around libtool lossage. 2007-10-17 Tor Lillqvist * gtk/Makefile.am (libgtk_win32_2_0_la_LIBADD): Use -Wl,-luuid instead of -luuid to work around libtool lossage. svn path=/trunk/; revision=18927 --- ChangeLog | 5 +++++ gtk/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9d52b26ce4..6a351864fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-17 Tor Lillqvist + + * gtk/Makefile.am (libgtk_win32_2_0_la_LIBADD): Use -Wl,-luuid + instead of -luuid to work around libtool lossage. + 2007-10-17 Matthias Clasen * configure.in: Bump version diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 75c60eb2e9..5897ffa308 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -840,7 +840,7 @@ libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) libgtk_x11_2_0_la_LIBADD = $(libadd) libgtk_linux_fb_2_0_la_LIBADD = $(libadd) -libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid +libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -Wl,-luuid libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) libgtk_quartz_2_0_la_LIBADD = $(libadd) libgtk_directfb_2_0_la_LIBADD = $(libadd)