23 files changed, 270 insertions, 97 deletions
diff --git a/ChangeLog b/ChangeLog
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 798bb3af1..9e004b61a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,21 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: More Win32 automake macros. For .def files:
+	GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp
+	files: TESTGMODULE_EXP (for programs that need to export symbols,
+	just testgmodule here). A new conditional, MS_LIB_AVAILABLE to
+	test whether the Microsoft librarian ("ar") is available to build
+	MS import libraries.
+ 
+	* glib/Makefile.am
+	* gmodule/Makefile.am: Use above. New rule to build MS import
+	library.
+
+	* glib/makefile.msc.in
+	* tests/makefile.msc.in
+	* tests/makefile.mingw.in: Use same DLL and import library names as
+	libtool.
+
 2001-09-24  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/gutf8.c, glib/gunibreak.c, glib/gunicollate.c,
diff --git a/configure.in b/configure.in
index dfe53470a..2ccb512f5 100644
--- a/configure.in
+++ b/configure.in
@@ -922,6 +922,7 @@ AC_MSG_RESULT($platform_win32)
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 
 AC_MSG_CHECKING([if building for pure Win32])
+ms_linker_available=no
 case "$host" in
   *-*-mingw*)
     os_win32=yes
@@ -929,6 +930,11 @@ case "$host" in
     G_MODULE_WIN32_RESOURCE=gmodule-win32res.lo
     G_OBJECT_WIN32_RESOURCE=gobject-win32res.lo
     G_THREAD_WIN32_RESOURCE=gthread-win32res.lo
+    GLIB_DEF=glib.def
+    GMODULE_DEF=gmodule.def
+    GOBJECT_DEF=gobject.def
+    GTHREAD_DEF=gthread.def
+    TESTGMODULE_EXP=testgmodule.exp
     ;;
   *)
     os_win32=no
@@ -936,6 +942,11 @@ case "$host" in
     G_MODULE_WIN32_RESOURCE=
     G_OBJECT_WIN32_RESOURCE=
     G_THREAD_WIN32_RESOURCE=
+    GLIB_DEF=
+    GMODULE_DEF=
+    GOBJECT_DEF=
+    GTHREAD_DEF=
+    TESTGMODULE_EXP=
     ;;
 esac
 AC_MSG_RESULT($os_win32)
@@ -944,6 +955,17 @@ AC_SUBST(G_LIB_WIN32_RESOURCE)
 AC_SUBST(G_MODULE_WIN32_RESOURCE)
 AC_SUBST(G_OBJECT_WIN32_RESOURCE)
 AC_SUBST(G_THREAD_WIN32_RESOURCE)
+AC_SUBST(GLIB_DEF)
+AC_SUBST(GMODULE_DEF)
+AC_SUBST(GOBJECT_DEF)
+AC_SUBST(GTHREAD_DEF)
+AC_SUBST(TESTGMODULE_EXP)
+
+if test $os_win32 = yes; then
+	AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
+	AC_MSG_RESULT($ms_librarian)
+fi
+AM_CONDITIONAL(MS_LIB_AVAILABLE, test $ms_librarian = yes)
 
 dnl ***********************
 dnl *** g_thread checks ***
diff --git a/glib/Makefile.am b/glib/Makefile.am
index e4cb7469f..c09f097d9 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -15,6 +15,10 @@ BUILT_EXTRA_DIST = 		\
 
 lib_LTLIBRARIES = libglib-1.3.la
 
+if MS_LIB_AVAILABLE
+noinst_DATA = glib-1.3.lib
+endif
+
 libglib_1_3_la_SOURCES = 	\
 	garray.c		\
 	gasyncqueue.c		\
@@ -138,7 +142,7 @@ export_symbols = -export-symbols glib.def
 endif
 
 libglib_1_3_la_LIBADD = @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@ 
-libglib_1_3_la_DEPENDENCIES = @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@
+libglib_1_3_la_DEPENDENCIES = @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
 
 libglib_1_3_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@@ -152,6 +156,9 @@ gspawn_win32_helper_LDADD = libglib-1.3.la
 	$(top_srcdir)/build/win32/lt-compile-resource glib.rc @G_LIB_WIN32_RESOURCE@
 endif
 
+glib-1.3.lib: libglib-1.3.la glib.def
+	lib -name:libglib-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:glib.def -out:$@
+
 glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib/glib.rc.in
 	cd $(top_builddir) && CONFIG_FILES=glib/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 38d941b47..c6afe5745 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -5,13 +5,8 @@ TOP = ..\..
 
 !INCLUDE $(TOP)\build\win32\make.msc
 
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
 ################################################################
 
-# Nothing much configurable below
-
 INCLUDES = -I . -I ..
 DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG
 DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
@@ -19,8 +14,8 @@ DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
 all :				\
 	..\config.h		\
 	..\glibconfig.h	\
-	glib-$(GLIB_VER).dll \
-	glib-$(GLIB_VER)s.lib \
+	libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll \
+	glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
 	gspawn-win32-helper.exe	\
 
 glib_OBJECTS =			\
@@ -75,21 +70,17 @@ glib_OBJECTS =			\
 ..\config.h: ..\config.h.win32
 	copy ..\config.h.win32 ..\config.h
 
-makefile.msc: makefile.msc.in
-	$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-	       -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
-
 ################ glib
 
 # create a static libary
-glib-$(GLIB_VER)s.lib : $(glib_OBJECTS)
-	lib /out:glib-$(GLIB_VER)s.lib $(glib_OBJECTS)
+glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS)
+	lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS)
 
-glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
-	$(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
+libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) glib.def
+	$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /implib:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:glib.def
 
-gspawn-win32-helper.exe : gspawn-win32-helper.c glib-$(GLIB_VER).dll
-	$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib
+gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+	$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) /subsystem:windows user32.lib
 
 ################ other stuff
 
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index af7ea85be..0c202b174 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* makefile.mingw.in: Fix missing end @ in @LT_CURRENT@.
+
+	* makefile.msc.in: Use same DLL and import library names as
+	libtool.
+	
 2001-09-19  Tor Lillqvist  <tml@iki.fi>
 
 	* gmodule.rc.in: Correct InternalName and OriginalFilename to
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 7e7823225..4678cb4e6 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -35,6 +35,10 @@ top_builddir_full=`cd \$(top_builddir); pwd`
 lib_LTLIBRARIES = libgmodule-1.3.la
 noinst_LTLIBRARIES = libgplugin_a.la libgplugin_b.la
 
+if MS_LIB_AVAILABLE
+noinst_DATA = gmodule-1.3.lib
+endif
+
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
@@ -51,7 +55,7 @@ libgmodule_1_3_la_LDFLAGS = \
 
 libgmodule_1_3_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib)
 
-libgmodule_1_3_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@
+libgmodule_1_3_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@
 
 libgplugin_a_la_SOURCES = libgplugin_a.c
 libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) $(plugin_rpath)
@@ -63,13 +67,20 @@ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_
 
 noinst_PROGRAMS = testgmodule
 testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-testgmodule_LDADD = libgmodule-1.3.la $(libglib) @G_MODULE_LIBS@
+testgmodule_LDADD = @TESTGMODULE_EXP@ libgmodule-1.3.la $(libglib) @G_MODULE_LIBS@
+testgmodule_DEPENDENCIES = @TESTGMODULE_EXP@
 
 if OS_WIN32
 @G_MODULE_WIN32_RESOURCE@ : gmodule.rc
 	$(top_srcdir)/build/win32/lt-compile-resource gmodule.rc @G_MODULE_WIN32_RESOURCE@
 endif
 
+gmodule-1.3.lib: libgmodule-1.3.la gmodule.def
+	lib -name:libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@
+
+testgmodule.exp: testgmodule.o
+	dlltool --output-exp testgmodule.exp testgmodule.o
+
 gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in
 	cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in
index 45a7169d1..9f2fba7e1 100644
--- a/gmodule/makefile.mingw.in
+++ b/gmodule/makefile.mingw.in
@@ -29,7 +29,7 @@ gmoduleconf.h: gmoduleconf.h.win32
 ################ The gmodule DLL
 
 libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(gmodule_OBJECTS) gmodule.def gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc
-	$(BUILD_DLL) gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT:@LT_REVISION@:@LT_AGE@ $(CFLAGS) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
+	$(BUILD_DLL) gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ $(CFLAGS) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc : gmodule.rc
 	cp $< $@
diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in
index d2ce4d185..653ab6e8e 100644
--- a/gmodule/makefile.msc.in
+++ b/gmodule/makefile.msc.in
@@ -5,19 +5,14 @@ TOP = ..\..
 
 !INCLUDE $(TOP)\build\win32\make.msc
 
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
 ################################################################
 
-# Nothing much configurable below
-
 INCLUDES = -I .. -I . -I ..\glib
 DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\"
 
 all : \
 	gmoduleconf.h \
-	gmodule-$(GLIB_VER).dll \
+	libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll \
 	testgmodule.exe
 
 gmodule_OBJECTS = \
@@ -26,27 +21,23 @@ gmodule_OBJECTS = \
 gmoduleconf.h: gmoduleconf.h.win32
 	copy gmoduleconf.h.win32 gmoduleconf.h
 
-makefile.msc: makefile.msc.in
-	$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-	       -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
-
-gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule.def
-	$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) \
-	..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule.def
+libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def
+	$(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) \
+	..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /implib:gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gmodule.def
 
 ################ test prog
 
-testgmodule.exe : gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll
-	$(CC) $(CFLAGS) testgmodule.obj gmodule-$(GLIB_VER).lib \
-	..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console 
+testgmodule.exe : libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll
+	$(CC) $(CFLAGS) testgmodule.obj gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib \
+	..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) /subsystem:console 
 
 libgplugin_a.dll : libgplugin_a.obj
-	$(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-$(GLIB_VER).lib \
-	..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib \
+	..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
 
 libgplugin_b.dll : libgplugin_b.obj
-	$(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-$(GLIB_VER).lib \
-	..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib \
+	..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
 
 clean::
 	del gmoduleconf.h
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index f05e2f9e5..f6533c945 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am: Use new macros for .def file, and check for
+	MS_LIB_AVAILABLE, new rule to build MS import library.
+
+	* makefile.msc.in: Use same DLL and import library names as
+	libtool.
+	
 2001-09-21  Hans Breuer  <hans@breuer.org>
 
 	* gobject.def : updated externals
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index b76b3c89e..1708392b8 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -17,6 +17,10 @@ libglib = $(top_builddir)/glib/libglib-1.3.la
 # libraries to compile and install
 lib_LTLIBRARIES = libgobject-1.3.la
 
+if MS_LIB_AVAILABLE
+noinst_DATA = gobject-1.3.lib
+endif
+
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
@@ -33,7 +37,7 @@ libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
 
 libgobject_1_3_la_LIBADD = @G_OBJECT_WIN32_RESOURCE@ $(libglib)
 
-libgobject_1_3_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@
+libgobject_1_3_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@ @GOBJECT_DEF@
 
 #
 # setup source file variables
@@ -204,6 +208,9 @@ if OS_WIN32
 	$(top_srcdir)/build/win32/lt-compile-resource gobject.rc @G_OBJECT_WIN32_RESOURCE@
 endif
 
+gobject-1.3.lib: libgobject-1.3.la gobject.def
+	lib -name:libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gobject.def -out:$@
+
 gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in
 	cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index f4186562a..731ed0612 100644
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -23,12 +23,11 @@ all :				\
 	gobject-query.exe     \
 	gmarshal.h              \
 	gmarshal.c              \
-	gobject-$(GLIB_VER).dll	\
-	gobject-$(GLIB_VER)s.lib
+	libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll	\
+	gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib
 
 gobject_OBJECTS =		\
 	gboxed.obj		\
-	gbsearcharray.obj	\
 	gclosure.obj		\
 	genums.obj		\
 	gobject.obj		\
@@ -53,27 +52,21 @@ gmarshal.h : gmarshal.list glib-genmarshal.exe
 gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
 	glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
 
-makefile.msc: makefile.msc.in
-	$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-	       -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
+libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def
+	$(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) \
+	..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) /implib:gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gobject.def
 
-gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
-	$(CC) $(CFLAGS) -Fm -LD -Fegobject-$(GLIB_VER).dll $(gobject_OBJECTS) \
-	..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gobject.def
-
-gobject-$(GLIB_VER)s.lib : $(gobject_OBJECTS) 
-	lib /out:gobject-$(GLIB_VER)s.lib $(gobject_OBJECTS)
+gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS) 
+	lib /out:$@ $(gobject_OBJECTS)
 
 # link glib's static version to avoid installing 
-glib-genmarshal.exe : glib-genmarshal.c ..\glib\glib-$(GLIB_VER)s.lib gmarshal.strings
+glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings
 	$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \
-	..\glib\glib-$(GLIB_VER)s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
+	..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
 
-gobject-query.exe : gobject-query.c ..\glib\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).dll
+gobject-query.exe : gobject-query.c libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 	$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \
-	..\glib\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
+	..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
 
 gmarshal.strings : gmarshal.list
 	perl marshal-genstrings.pl > gmarshal.strings
-
-		
diff --git a/gthread/ChangeLog b/gthread/ChangeLog
index 8159e1239..20ae0b56c 100644
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-25  Tor Lillqvist  <tml@iki.fi>
+
+	* Makefile.am: Use new macros for .def file, and check for
+	MS_LIB_AVAILABLE, new rule to build MS import library.
+
+	* makefile.msc.in: Use same DLL and import library names as
+	libtool.
+	
 2001-09-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gthread-posix.c: Add g_thread_equal_posix_impl and add to the
diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 4a03529f7..1c35e1c45 100644
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -25,6 +25,10 @@ top_builddir_full=`cd \$(top_builddir); pwd`
 
 lib_LTLIBRARIES = libgthread-1.3.la
 
+if MS_LIB_AVAILABLE
+noinst_DATA = gthread-1.3.lib
+endif
+
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
@@ -39,13 +43,16 @@ libgthread_1_3_la_LDFLAGS = \
 
 libgthread_1_3_la_LIBADD = @G_THREAD_WIN32_RESOURCE@ @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
 
-libgthread_1_3_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@
+libgthread_1_3_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ @GTHREAD_DEF@
 
 if OS_WIN32
 @G_THREAD_WIN32_RESOURCE@ : gthread.rc
 	$(top_srcdir)/build/win32/lt-compile-resource gthread.rc @G_THREAD_WIN32_RESOURCE@
 endif
 
+gthread-1.3.lib: libgthread-1.3.la gthread.def
+	lib -name:libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gthread.def -out:$@
+
 gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
 	cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in
index a4547c13b..2cf7d5672 100644
--- a/gthread/makefile.msc.in
+++ b/gthread/makefile.msc.in
@@ -7,29 +7,20 @@ TOP = ..\..
 
 !INCLUDE $(TOP)\build\win32\make.msc
 
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
 ################################################################
 
-# Nothing much configurable below
-
 INCLUDES = -I .. -I . -I ..\glib
 DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
 # DEPCFLAGS = $(PTHREAD_CFLAGS)
 # DEPCLIBS = $(PTHREAD_LIBS) 
 all : \
-	gthread-$(GLIB_VER).dll
+	libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 
 gthread_OBJECTS = \
 	gthread-impl.obj
 
-makefile.msc: makefile.msc.in
-	$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-	       -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
-
 gthread-impl.obj : gthread-impl.c gthread-win32.c
 	$(CC) -c $(CFLAGS) gthread-impl.c
-	
-gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread.def
-	$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def
+
+libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def
+	$(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gthread.def
diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in
index 4db12b267..1c11bf4b5 100644
--- a/tests/makefile.mingw.in
+++ b/tests/makefile.mingw.in
@@ -46,28 +46,23 @@ DLLS = \
 
 all:	$(TESTS) $(DLLS)
 
-ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
-makefile.mingw: makefile.mingw.in
-	sed -e 's,@GLIB[_]VERSION@,@GLIB_VERSION@,' <$< >$@
-endif
-
 .SUFFIXES: .c .i .exe
 
 .c.exe:
-	$(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread -L ../glib -lglib
+	$(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread -L ../glib -lglib-1.3
 
 module-test.exe : module-test.o
-	$(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib -L ../gmodule -lgmodule $(LDFLAGS)
+	$(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS)
 	$(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o
-	$(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib -L ../gmodule -lgmodule $(LDFLAGS)
+	$(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS)
 	$(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o
-	$(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib -L ../gmodule -lgmodule $(LDFLAGS)
+	$(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS)
 
 libmoduletestplugin_a.dll : libmoduletestplugin_a.o
-	$(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib -L ../gmodule -lgmodule
+	$(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3
 
 libmoduletestplugin_b.dll : libmoduletestplugin_b.o
-	$(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib -L ../gmodule -lgmodule
+	$(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3
 
 check:	all
 	@for P in $(TESTS) ; do echo $$P; ./$$P; done
diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index ead522dc3..91b667317 100644
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -5,13 +5,8 @@ TOP = ..\..
 
 !INCLUDE $(TOP)\build\win32\make.msc
 
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
 ################################################################
 
-# Nothing much configurable below
-
 INCLUDES = -I .. -I ..\glib -I ..\gmodule
 DEFINES = -DHAVE_CONFIG_H
 
@@ -49,19 +44,15 @@ TESTS = \
 
 all :	$(TESTS)
 
-makefile.msc: makefile.msc.in
-	$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-	       -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
-
 .c.exe :
 	$(CC) $(CFLAGS) -c $<
-	$(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-$(GLIB_VER).lib ..\gmodule\gmodule-$(GLIB_VER).lib ..\gthread\gthread-$(GLIB_VER).lib $(LDFLAGS) user32.lib /subsystem:console
+	$(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gthread\gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) user32.lib /subsystem:console
 
 libmoduletestplugin_a.dll : libmoduletestplugin_a.obj
-	$(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
 
 libmoduletestplugin_b.dll : libmoduletestplugin_b.obj
-	$(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
 
 check:	all
 	for %p in ($(TESTS)) do %p