summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorjacob berkman <jacob@ximian.com>2001-10-29 21:50:06 +0000
committerJacob Berkman <jberkman@src.gnome.org>2001-10-29 21:50:06 +0000
commit7c12bae85c4f2e0bc1483b80c4bcacc9ce10c344 (patch)
tree2efbe22de46b045aef94af48c33d23bcd831e089 /gtk
parent14a5e057c721828ccb91519c225d1cd228f0a237 (diff)
downloadgtk+-7c12bae85c4f2e0bc1483b80c4bcacc9ce10c344.tar.gz
automake doesn't support conditionalized LDFLAGS, so put win32 flags in
2001-10-29 jacob berkman <jacob@ximian.com> * gdk/Makefile.am (LDFLAGS): * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized LDFLAGS, so put win32 flags in here
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f80b6e58e1..bef5917e0a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -28,7 +28,7 @@ endif
if OS_WIN32
gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols $(gtk_def)
+gtk_win32_symbols = -export-symbols $(gtk_def) -lwsock32
gtk_win32res_lo = gtk-win32res.lo
@@ -72,6 +72,7 @@ LDFLAGS = @STRIP_BEGIN@ \
@LIBTOOL_EXPORT_OPTIONS@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
$(top_builddir)/gdk/@gdktargetlib@ \
+ $(gtk_win32_symbols) \
@GTK_DEP_LIBS@ \
@STRIP_END@
@@ -547,7 +548,6 @@ if USE_WIN32
libgtk_win32_includedir = $(includedir)/gtk-2.0/gtk
libgtk_win32_include_HEADERS = $(gtk_target_headers)
libgtk_win32_1_3_la_SOURCES = $(gtk_target_sources)
-libgtk_win32_1_3_la_LDFLAGS = $(gtk_win32_symbols) -lwsock32
libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo)
libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
endif