summaryrefslogtreecommitdiff
path: root/gtk/Makefile.am
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2002-01-01 22:17:09 +0000
committerTor Lillqvist <tml@src.gnome.org>2002-01-01 22:17:09 +0000
commitc8940d6fdc2d53bb7af432fed13574bb44b37605 (patch)
tree137c1b712a36226c7dc98709f062bc4556a18a52 /gtk/Makefile.am
parent77b8bac91d20a3c9ac1803b62f014e3a157b3de0 (diff)
downloadgdk-pixbuf-c8940d6fdc2d53bb7af432fed13574bb44b37605.tar.gz
Append EXEEXT to ../gdk-pixbuf/gdk-pixbuf-csource.
2002-01-01 Tor Lillqvist <tml@iki.fi> * demos/Makefile.am (test-inline-pixbufs.h): Append EXEEXT to ../gdk-pixbuf/gdk-pixbuf-csource. 2001-12-31 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkgc-win32.c (predraw_set_foreground): Improved error handling. (gdk_win32_hdc_get,gdk_win32_hdc_release): Silence gcc -Wall. * gdk/win32/gdkimage-win32.c (_gdk_win32_get_image): Silence gcc -Wall. Use GDK_IS_PIXMAP_IMPL_WIN32 instead of GDK_IS_PIXMAP in one more place. * gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Silence gcc -Wall. * gtk/Makefile.am (libgtk_win32_1_3_la_LDFLAGS): Add -lwsock32.
Diffstat (limited to 'gtk/Makefile.am')
-rw-r--r--gtk/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 505ef1de3..5e5a1b3ce 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) -lwsock32
+gtk_win32_symbols = -export-symbols $(gtk_def)
gtk_win32res_lo = gtk-win32res.lo
@@ -72,7 +72,6 @@ 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@
@@ -580,7 +579,8 @@ 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_LIBADD = $(gtk_win32res_lo)
-libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
+libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def)
+libgtk_win32_1_3_la_LDFLAGS = $(gtk_win32_symbols) -lwsock32
endif
EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la