From e6572dfb9525110c786bde8c83ad824330638169 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 17 Oct 2007 18:39:09 +0000 Subject: [PATCH] Move -Wl,-luuid to LDFLAGS to make libtool happy. 2007-10-17 Owen Taylor * gtk/Makefile.am (libgtk_win32_2_0_la_LDFLAGS): Move -Wl,-luuid to LDFLAGS to make libtool happy. svn path=/trunk/; revision=18928 --- ChangeLog | 5 +++++ gtk/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a351864fa..3fe5e9767e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-17 Owen Taylor + + * gtk/Makefile.am (libgtk_win32_2_0_la_LDFLAGS): Move -Wl,-luuid + to LDFLAGS to make libtool happy. + 2007-10-17 Tor Lillqvist * gtk/Makefile.am (libgtk_win32_2_0_la_LIBADD): Use -Wl,-luuid diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 5897ffa308..8312f69524 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -834,13 +834,13 @@ libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts) -libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) +libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) 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 -Wl,-luuid +libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 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)