Re: GNOME CVS: gtk+ tml

[jacob berkman <jacob ximian com>]

On Mon, 2001-10-29 at 02:06, Gnome CVS User wrote:
> 
> CVSROOT:	/cvs/gnome
> Module name:	gtk+
> Changes by:	tml	01/10/29 02:06:37
> 
> Modified files:
> 	.              : ChangeLog Makefile.am README.win32 acconfig.h 
> 	                 configure.in 
> 	gdk            : Makefile.am gdkglobals.c makefile.mingw.in 
> 	gtk            : Makefile.am gtk-win32.rc.in gtk.def 
> 	                 gtkfilesel.c gtkmain.c gtkprivate.h gtkrc.c 
> 	                 makefile.mingw.in maketypes.awk 
> Added files:
> 	.              : gtk-zip.sh.in 
> 
> Log message:
> 2001-10-29  Tor Lillqvist  <tml iki fi>
> 
> * gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
> macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
> MS_LIB_AVAILABLE, build MS import library. Install the import
> libraries. If HAVE_WINTAB, link with the Wintab library.
> 
> * gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
> macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
> file. Install import libraries.

this (or a related) commit broke the build:

automake: gdk/Makefile.am: warning: automake does not support
libgdk_win32_1_3_la_LDFLAGS being defined conditionally
make[1]: *** [distdir] Error 1

i've committed the following patch which i think works (it at least
builds on unix), please fix it if it's broken on win32.

jacob
-- 
"Beat mixing is 10000 times more fun than even video games."
	-- bt

Index: gdk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/Makefile.am,v
retrieving revision 1.73
diff -u -r1.73 Makefile.am
--- gdk/Makefile.am	2001/10/29 07:06:35	1.73
+++ gdk/Makefile.am	2001/10/29 21:48:42
@@ -70,6 +70,7 @@
 	$(no_undefined)						\
 	@LIBTOOL_EXPORT_OPTIONS@				\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la		\
+	$(gdk_win32_symbols)					\
 	@GDK_DEP_LIBS@						\
 @STRIP_END@
 
@@ -173,8 +174,6 @@
 
 libgdk_win32_include_HEADERS = $(gdk_headers)
 libgdk_win32_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
-
-libgdk_win32_1_3_la_LDFLAGS = $(gdk_win32_symbols)
 
 endif
 
Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.188
diff -u -r1.188 Makefile.am
--- gtk/Makefile.am	2001/10/29 07:06:36	1.188
+++ gtk/Makefile.am	2001/10/29 21:48:42
@@ -28,7 +28,7 @@
 
 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 @@
 	@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 @@
 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