Use correct DLL and import library names, with GTK_API_VERSION in name,

2003-01-05  Tor Lillqvist  <tml@iki.fi>

	* gtk-zip.sh.in: Use correct DLL and import library names, with
	GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
	(DEVZIP): Add gdk-pixbuf-query-loaders.exe.

	* configure.in: Improve check for dimm.h.

	* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
	gdk-pixbuf/Makefile.am.

	* gdk-pixbuf/makefile.mingw.in
	* gdk-pixbuf/pixops/makefile.mingw.in
	* gdk/makefile.mingw.in
	* gdk/win32/makefile.mingw.in
	* gtk/makefile.mingw.in: Remove. Not maintained anyway.

	* gdk-pixbuf/Makefile.am
	* gdk-pixbuf/pixops/Makefile.am
	* gdk/Makefile.am
	* gdk/win32/Makefile.am
	* gtk/Makefile.am
	* configure.in: Remove makefile.mingw{,.in} from here, too.

	* README.win32: Updates. Don't mention the now removed
	makefile.mingw files.

	* gdk/gdk.def
	* gtk/gtk.def: Add a couple of missing entries.

	* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().

	* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
	earlier.

	* gdk/win32/rc/Makefile.am: Add hack to help
	build/win32/lt-compile-resource decide which kind of libtool
	object file to produce.

5 files changed, 7 insertions, 175 deletions

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index cd401dd5a2..211a00e2c3 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am (gdk-pixbuf.loaders): Use @SOEXT@ in the find command.
+
+	* gdk_pixbuf.def: Add gdk_pixbuf_loader_set_size.
+
 2003-01-03  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Don't crash if
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index b3856f3d5a..466c95871e 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -393,8 +393,6 @@ CLEANFILES += xgen-gmc
 
 EXTRA_DIST =			\
         gdk-pixbuf-csource.1    \
-	makefile.mingw		\
-	makefile.mingw.in	\
 	makefile.msc		\
 	gdk_pixbuf.def		\
 	gdk_pixbuf.rc		\
@@ -438,7 +436,7 @@ install-data-local: install-ms-lib install-libtool-import-lib
 all-local: gdk-pixbuf.loaders
 
 gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
-	if find . -name 'libpixbufloader-*.so' | grep 'so' > /dev/null ; then \
+	if find . -name 'libpixbufloader-*.@SOEXT@' | grep '@SOEXT@' > /dev/null ; then \
           echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
 	  GDK_PIXBUF_MODULEDIR=.libs $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > ./gdk-pixbuf.loaders ;\
 	else \
diff --git a/gdk-pixbuf/makefile.mingw.in b/gdk-pixbuf/makefile.mingw.in
deleted file mode 100644
index 2d356d22fb..0000000000
--- a/gdk-pixbuf/makefile.mingw.in
+++ /dev/null
@@ -1,130 +0,0 @@
-####
-#### Out of order! Use autoconfiscation.
-####
-
-## Makefile for building the gdk_pixbuf DLL with gcc on Win32
-## Use: make -f makefile.mingw
-
-TOP = ../..
-
-include ../build/win32/make.mingw
-
-# Possibly override GTK+ version from build/win32/module.defs
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
-
-OPTIMIZE = -g
-
-INCLUDES = -I . -I .. 
-DEPCFLAGS = $(GLIB_CFLAGS) $(INTL_CFLAGS)
-
-all :						\
-	../config.h				\
-	gdk_pixbuf-$(GDK_PIXBUF_VER).dll	\
-	pixbufloader-bmp.dll			\
-	pixbufloader-gif.dll			\
-	pixbufloader-ico.dll			\
-	pixbufloader-jpeg.dll			\
-	pixbufloader-png.dll			\
-	pixbufloader-pnm.dll			\
-	pixbufloader-ras.dll			\
-	pixbufloader-tiff.dll			\
-	pixbufloader-wbmp.dll			\
-	pixbufloader-xpm.dll			\
-	make-inline-pixbuf.exe			\
-	test-gdk-pixbuf.exe
-
-gdk_pixbuf_OBJECTS =				\
-	gdk-pixbuf.o				\
-	gdk-pixbuf-animation.o			\
-	gdk-pixbuf-data.o			\
-	gdk-pixbuf-io.o				\
-	gdk-pixbuf-scale.o			\
-	gdk-pixbuf-util.o			\
-	pixops/libpixops.a
-
-../config.h : ../config.h.win32
-	cp $< $@
-
-gdk_pixbuf-$(GDK_PIXBUF_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def
-	$(GLIB)/build-dll gdk_pixbuf $(GDK_PIXBUF_VER) gdk_pixbuf.def $(gdk_pixbuf_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-gdk-pixbuf.o:: gdk-pixbuf-marshal.c
-
-gdk-pixbuf-marshal.c :
-	$(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >$@
-
-pixops/libpixops.a :
-	cd pixops && $(MAKE) -f makefile.mingw libpixops.a
-
-pixbufloader_bmp_OBJECTS = io-bmp.o
-
-pixbufloader-bmp.dll : $(pixbufloader_bmp_OBJECTS) pixbufloader_bmp.def
-	$(GLIB)/build-dll pixbufloader-bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_gif_OBJECTS = io-gif.o
-
-pixbufloader-gif.dll : $(pixbufloader_gif_OBJECTS) pixbufloader_gif.def
-	$(GLIB)/build-dll pixbufloader-gif - pixbufloader_gif.def $(pixbufloader_gif_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_ico_OBJECTS = io-ico.o
-
-pixbufloader-ico.dll : $(pixbufloader_ico_OBJECTS) pixbufloader_ico.def
-	$(GLIB)/build-dll pixbufloader-ico - pixbufloader_ico.def $(pixbufloader_ico_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_jpeg_OBJECTS = io-jpeg.o
-
-io-jpeg.o : io-jpeg.c
-	$(CC) $(CFLAGS) $(JPEG_CFLAGS) -c $<
-
-pixbufloader-jpeg.dll : $(pixbufloader_jpeg_OBJECTS) pixbufloader_jpeg.def
-	$(GLIB)/build-dll pixbufloader-jpeg - pixbufloader_jpeg.def $(pixbufloader_jpeg_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(JPEG_LIBS) $(INTL_LIBS)
-
-pixbufloader_png_OBJECTS = io-png.o
-
-io-png.o : io-png.c
-	$(CC) $(CFLAGS) $(PNG_CFLAGS) -c $<
-
-pixbufloader-png.dll : $(pixbufloader_png_OBJECTS) pixbufloader_png.def
-	$(GLIB)/build-dll pixbufloader-png - pixbufloader_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(PNG_LIBS) $(INTL_LIBS)
-
-pixbufloader_pnm_OBJECTS = io-pnm.o
-
-pixbufloader-pnm.dll : $(pixbufloader_pnm_OBJECTS) pixbufloader_pnm.def
-	$(GLIB)/build-dll pixbufloader-pnm - pixbufloader_pnm.def $(pixbufloader_pnm_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_ras_OBJECTS = io-ras.o
-
-pixbufloader-ras.dll : $(pixbufloader_ras_OBJECTS) pixbufloader_ras.def
-	$(GLIB)/build-dll pixbufloader-ras - pixbufloader_ras.def $(pixbufloader_ras_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_tiff_OBJECTS = io-tiff.o
-
-pixbufloader-tiff.dll : $(pixbufloader_tiff_OBJECTS) pixbufloader_tiff.def
-	$(GLIB)/build-dll pixbufloader-tiff - pixbufloader_tiff.def $(pixbufloader_tiff_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(INTL_LIBS)
-
-io-tiff.o : io-tiff.c
-	$(CC) $(CFLAGS) $(TIFF_CFLAGS) -c $<
-
-pixbufloader_wbmp_OBJECTS = io-wbmp.o
-
-pixbufloader-wbmp.dll : $(pixbufloader_wbmp_OBJECTS) pixbufloader_wbmp.def
-	$(GLIB)/build-dll pixbufloader-wbmp - pixbufloader_wbmp.def $(pixbufloader_wbmp_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_xpm_OBJECTS = io-xpm.o
-
-pixbufloader-xpm.dll : $(pixbufloader_xpm_OBJECTS) pixbufloader_xpm.def
-	$(GLIB)/build-dll pixbufloader-xpm - pixbufloader_xpm.def $(pixbufloader_xpm_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-make-inline-pixbuf.exe : make-inline-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
-	$(CC) $(CFLAGS) -o $@ make-inline-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
-
-test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
-	$(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GTK_LIBS) $(GLIB_LIBS)
-
-ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-	sed -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
-	    -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <$< >$@
-endif
diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am
index 67c20444cd..16bc8d4b7b 100644
--- a/gdk-pixbuf/pixops/Makefile.am
+++ b/gdk-pixbuf/pixops/Makefile.am
@@ -29,6 +29,4 @@ libpixops_la_SOURCES =  		\
 
 EXTRA_DIST =				\
 	DETAILS				\
-	makefile.mingw			\
-	makefile.mingw.in			\
 	makefile.msc
diff --git a/gdk-pixbuf/pixops/makefile.mingw.in b/gdk-pixbuf/pixops/makefile.mingw.in
deleted file mode 100644
index 42e8fae48a..0000000000
--- a/gdk-pixbuf/pixops/makefile.mingw.in
+++ /dev/null
@@ -1,40 +0,0 @@
-## Makefile for building libpixops.a with gcc on Win32
-## Use: make -f makefile.mingw
-
-TOP = ../../..
-
-include $(TOP)/build/win32/make.mingw
-
-# Possibly override GTK+ version from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-
-OPTIMIZE = -g
-
-INCLUDES = -I .. -I ../..
-DEPCFLAGS = $(GLIB_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(JPEG_CLFAGS) $(TIFF_CFLAGS)
-
-all :						\
-	../../config.h				\
-	libpixops.a				\
-	timescale.exe
-
-libpixops_OBJECTS = 				\
-	pixops.o				\
-	have_mmx.o				\
-	scale_line_22_33_mmx.o			\
-	composite_line_22_4a4_mmx.o		\
-	composite_line_color_22_4a4_mmx.o
-
-../../config.h : ../../config.h.win32
-	cp $< $@
-
-libpixops.a : $(libpixops_OBJECTS)
-	ar rv $@ $?
-
-timescale.exe : timescale.o libpixops.a
-	$(CC) $(CFLAGS) -o $@ timescale.o libpixops.a $(GLIB_LIBS)
-
-makefile.mingw: makefile.mingw.in
-	sed -e 's,@GTK_MAJOR[_]VERSION@,@GTK_MAJOR_VERSION@,' \
-	    -e 's,@GTK_MINOR[_]VERSION@,@GTK_MINOR_VERSION@,' <$< >$@
-