Move -Wl,-luuid to LDFLAGS to make libtool happy.

2007-10-17  Owen Taylor  <otaylor@redhat.com>

        * gtk/Makefile.am (libgtk_win32_2_0_la_LDFLAGS): Move -Wl,-luuid
        to LDFLAGS to make libtool happy.

svn path=/trunk/; revision=18928

diff --git a/ChangeLog b/ChangeLog
index 6a351864fa2e6246cbb5618ec7291d6048aac106..3fe5e9767e78a0ffb4d1ea2c3c95c3a807670532 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-17  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am (libgtk_win32_2_0_la_LDFLAGS): Move -Wl,-luuid
+       to LDFLAGS to make libtool happy.
+
 2007-10-17  Tor Lillqvist  <tml@novell.com>
 
        * gtk/Makefile.am (libgtk_win32_2_0_la_LIBADD): Use -Wl,-luuid

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 5897ffa308bfddd8ab3da76b60ae6478248b61f5..8312f695246fa611118be8ef8029795954f842a3 100644 (file)
--- 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)