diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/Makefile.am libgnomedb-1.9.100/Makefile.am
--- libgnomedb-1.9.100-orig/Makefile.am	2005-08-12 06:01:48.000000000 -0500
+++ libgnomedb-1.9.100/Makefile.am	2005-11-23 16:05:12.133625000 -0600
@@ -25,6 +25,7 @@
 endif
 
 SUBDIRS = \
+	win32 \
 	po \
 	libgnomedb \
 	$(LIBGLADE_DIRECTORY) \
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/configure.in libgnomedb-1.9.100/configure.in
--- libgnomedb-1.9.100-orig/configure.in	2005-10-13 03:48:50.000000000 -0500
+++ libgnomedb-1.9.100/configure.in	2005-11-24 15:45:17.352375000 -0600
@@ -25,6 +25,10 @@
 #   set GNOMEDB_CURRENT += 1, GNOMEDB_REVISION and GNOMEDB_AGE to 0
 # - If interfaces is the same as the previous version, set GNOMEDB_REVISION += 1
 #
+# IMPORTANT for Win32:
+#   If bumping these numbers changes the soname, be sure to also change 
+#   the dll names in win32/Makefile.am.
+#
 GNOMEDB_CURRENT=4
 GNOMEDB_REVISION=0
 GNOMEDB_AGE=0
@@ -51,6 +55,41 @@
         CFLAGS="-Wall -g"
 fi
 
+dnl Win32
+AC_MSG_CHECKING([for Win32 platform])
+case "$host" in
+*-cygwin*)
+    platform_win32=yes
+    os_win32=no
+    is_win32=Cygwin
+    NO_UNDEFINED='-no-undefined'
+    SOPREFIX='cyg'
+    SOEXT='.dll'
+    ;;
+*-mingw*)
+    platform_win32=yes
+    os_win32=yes
+    is_win32=MinGW
+    NO_UNDEFINED='-no-undefined'
+    SOPREFIX='lib'
+    SOEXT='.dll'
+    ;;
+*)
+    platform_win32=no
+    os_win32=no
+    is_win32=no
+    NO_UNDEFINED=''
+    SOCKET_LIBS=''
+    SOPREFIX='lib'
+    SOEXT='.so'
+    ;;
+esac
+AC_MSG_RESULT([$is_win32])
+AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes])
+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+AC_SUBST(NO_UNDEFINED)
+AC_SUBST(SOPREFIX)
+AC_SUBST(SOEXT)
 
 dnl ******************************
 dnl glib-genmarshal
@@ -86,12 +125,16 @@
 dnl Checks for libraries
 dnl ******************************
 
+GLIB_MODULES="glib-2.0 >= 2.6.0"
 GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0"
 LIBGDA_MODULES="libgda-2.0 >= 1.9.99"
 GNOME_MODULES="libgnomeui-2.0 >= 1.103"
 LIBGLADE_MODULES="libglade-2.0"
 LIBGNOMEDB_REQUIRES="$GTK_MODULES $LIBGDA_MODULES"
 
+PKG_CHECK_MODULES(PARSER, $GLIB_MODULES)
+AC_SUBST(PARSER_CFLAGS)
+AC_SUBST(PARSER_LIBS)
 PKG_CHECK_MODULES(LIBGNOMEDB, $GTK_MODULES $LIBGDA_MODULES)
 AC_SUBST(LIBGNOMEDB_CFLAGS)
 AC_SUBST(LIBGNOMEDB_LIBS)
@@ -256,6 +299,7 @@
 Makefile
 libgnomedb.spec
 libgnomedb-2.0.pc
+win32/Makefile
 control-center/Makefile
 data/Makefile
 doc/Makefile
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/control-center/Makefile.am libgnomedb-1.9.100/control-center/Makefile.am
--- libgnomedb-1.9.100-orig/control-center/Makefile.am	2005-09-26 05:30:51.000000000 -0500
+++ libgnomedb-1.9.100/control-center/Makefile.am	2005-11-23 15:46:02.227375000 -0600
@@ -28,12 +28,13 @@
 	main.c \
 	provider-config.c \
 	provider-config.h
-gnome_database_properties_LDADD=\
-	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) \
+
+gnome_database_properties_LDADD= \
 	$(top_builddir)/libgnomedb/libgnomedb-3.la \
 	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-        $(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la
+	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
 
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/extra/Makefile.am libgnomedb-1.9.100/extra/Makefile.am
--- libgnomedb-1.9.100-orig/extra/Makefile.am	2005-02-28 06:01:01.000000000 -0600
+++ libgnomedb-1.9.100/extra/Makefile.am	2005-11-23 15:47:07.836750000 -0600
@@ -22,18 +22,20 @@
 	gnome-db-browser.c
 
 gnome_db_browser_LDADD = \
-	$(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
+	$(top_builddir)/libgnomedb/libgnomedb-3.la \
 	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
 	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la 
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS)
 
 gnome_db_verify_file_SOURCES = \
 	gnome-db-verify-file.c
 
 gnome_db_verify_file_LDADD = \
-	$(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
-        $(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-        $(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la
+	$(top_builddir)/libgnomedb/libgnomedb-3.la \
+	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
+	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS)
 
 EXTRA_DIST = README
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/glade/Makefile.am libgnomedb-1.9.100/glade/Makefile.am
--- libgnomedb-1.9.100-orig/glade/Makefile.am	2005-09-26 05:38:11.000000000 -0500
+++ libgnomedb-1.9.100/glade/Makefile.am	2005-11-24 15:22:58.727375000 -0600
@@ -13,10 +13,10 @@
 
 libgnomedb_la_LIBADD = \
 	$(top_builddir)/libgnomedb/libgnomedb-3.la	\
-	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS)
+	$(LIBGLADE_LIBS)
 
 libgnomedb_la_LDFLAGS = \
-	-export-dynamic -module -avoid-version -no-undefined
+	-export-dynamic -module -avoid-version $(NO_UNDEFINED)
 
 libgnomedb_la_SOURCES = \
 	glade-gnomedb.c
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/libgnomedb/Makefile.am libgnomedb-1.9.100/libgnomedb/Makefile.am
--- libgnomedb-1.9.100-orig/libgnomedb/Makefile.am	2005-09-26 05:37:39.000000000 -0500
+++ libgnomedb-1.9.100/libgnomedb/Makefile.am	2005-11-23 19:01:43.977375000 -0600
@@ -1,6 +1,12 @@
 lib_LTLIBRARIES = libgnomedb-3.la
 
-SUBDIRS = . handlers graph parser
+SUBDIRS = parser . graph handlers
+
+if PLATFORM_WIN32
+WIN32_BOOTSTRAP_LIBS = \
+	$(top_builddir)/win32/libgnomedb_graph-3.la \
+	$(top_builddir)/win32/libgnomedb_handlers-3.la
+endif
 
 INCLUDES = \
 	-I$(top_srcdir) \
@@ -209,8 +215,8 @@
 	utility.c
 
 $(libgnomedb_3_la_OBJECTS): $(libgnomedb_marshal_built_files)
-libgnomedb_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) -no-undefined
-libgnomedb_3_la_LIBADD = $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(LIBGLADE_LIBS) $(WITHGNOME_LIBS) 
+libgnomedb_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+libgnomedb_3_la_LIBADD = parser/libgnomedb_parser-3.la -lgdasql $(WIN32_BOOTSTRAP_LIBS) $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(LIBGLADE_LIBS) $(WITHGNOME_LIBS) 
 
 libgnomedb_marshal_built_files = marshal.h marshal.c
 
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/libgnomedb/graph/Makefile.am libgnomedb-1.9.100/libgnomedb/graph/Makefile.am
--- libgnomedb-1.9.100-orig/libgnomedb/graph/Makefile.am	2005-02-28 06:01:02.000000000 -0600
+++ libgnomedb-1.9.100/libgnomedb/graph/Makefile.am	2005-11-23 18:47:21.821125000 -0600
@@ -59,4 +59,5 @@
         gnome-db-graph-item.c
 
 
-libgnomedb_graph_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE)
+libgnomedb_graph_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+libgnomedb_graph_3_la_LIBADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(WITHGNOME_LIBS)
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/libgnomedb/handlers/Makefile.am libgnomedb-1.9.100/libgnomedb/handlers/Makefile.am
--- libgnomedb-1.9.100-orig/libgnomedb/handlers/Makefile.am	2005-05-27 07:03:03.000000000 -0500
+++ libgnomedb-1.9.100/libgnomedb/handlers/Makefile.am	2005-11-24 15:28:33.774250000 -0600
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libgnomedb_handlers-3.la
 
-SUBDIRS = plugins
+SUBDIRS = . plugins
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) -I$(srcdir)/.. \
@@ -61,4 +61,5 @@
 	gnome-db-handler-time.c
 
 
-libgnomedb_handlers_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE)
+libgnomedb_handlers_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+libgnomedb_handlers_3_la_LIBADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS)
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/libgnomedb/handlers/plugins/Makefile.am libgnomedb-1.9.100/libgnomedb/handlers/plugins/Makefile.am
--- libgnomedb-1.9.100-orig/libgnomedb/handlers/plugins/Makefile.am	2005-08-12 06:30:02.000000000 -0500
+++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/Makefile.am	2005-11-24 15:25:31.602375000 -0600
@@ -19,6 +19,12 @@
         -DDATADIR=\""$(datadir)"\" \
         -DLIBDIR=\""$(plugindir)"\"
 
+common_ldflags = -module -export-dynamic -avoid-version $(NO_UNDEFINED)
+
+common_libadd = $(top_builddir)/libgnomedb/libgnomedb-3.la \
+	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
+	$(LIBGNOMEDB_LIBS)
+
 #
 # Plugin to handle TEXT
 #
@@ -34,8 +40,8 @@
 	gnome-db-handler-text.c \
 	gnome-db-entry-text.c
 
-libgnomedb_handler_text_la_LDFLAGS = -module -export-dynamic -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE)
-
+libgnomedb_handler_text_la_LDFLAGS = $(common_ldflags)
+libgnomedb_handler_text_la_LIBADD = $(common_libadd)
 
 #
 # Plugin to handle CIDR
@@ -53,8 +59,8 @@
 	gnome-db-handler-cidr.c \
 	gnome-db-entry-cidr.c
 
-libgnomedb_handler_cidr_la_LDFLAGS = -module -export-dynamic -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE)
-
+libgnomedb_handler_cidr_la_LDFLAGS = $(common_ldflags)
+libgnomedb_handler_cidr_la_LIBADD = $(common_libadd)
 
 #
 # Plugin to handle MD5 "encripted" passwords
@@ -72,7 +78,8 @@
 	gnome-db-handler-passmd5.c \
 	gnome-db-entry-passmd5.c
 
-libgnomedb_handler_passmd5_la_LDFLAGS = -module -export-dynamic -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) -lssl
+libgnomedb_handler_passmd5_la_LDFLAGS = $(common_ldflags)
+libgnomedb_handler_passmd5_la_LIBADD = $(common_libadd) -lcrypto
 
 #
 # Plugin to handle file names
@@ -89,4 +96,6 @@
 	gnome-db-handler-filesel.c \
 	gnome-db-entry-filesel.c
 
-libgnomedb_handler_filesel_la_LDFLAGS = -module -export-dynamic -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE)
+libgnomedb_handler_filesel_la_LDFLAGS = $(common_ldflags)
+libgnomedb_handler_filesel_la_LIBADD = $(common_libadd)
+
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/libgnomedb/parser/Makefile.am libgnomedb-1.9.100/libgnomedb/parser/Makefile.am
--- libgnomedb-1.9.100-orig/libgnomedb/parser/Makefile.am	2005-05-27 07:03:07.000000000 -0500
+++ libgnomedb-1.9.100/libgnomedb/parser/Makefile.am	2005-11-24 15:45:42.696125000 -0600
@@ -6,10 +6,7 @@
 AM_CPPFLAGS = \
         -I$(top_srcdir) -I$(srcdir)/.. \
         -I$(top_builddir) \
-        $(LIBGNOMEDB_CFLAGS) \
-        $(GTKSOURCEVIEW_CFLAGS) \
-        $(LIBGLADE_CFLAGS) \
-        $(WITHGNOME_CFLAGS) \
+        $(PARSER_CFLAGS) \
         -DLIBGNOMEDB_ICONSDIR=\""$(datadir)/pixmaps/libgnomedb"\" \
         -DLIBGNOMEDB_DATADIR=\""$(datadir)/gnome-db"\" \
         -DLIBGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\" \
@@ -42,9 +39,10 @@
         gnome-db-sql-parser.c \
         gnome-db-sql-tree.c
 
-libgnomedb_parser_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE)
+libgnomedb_parser_3_la_LDFLAGS = -version-info $(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+libgnomedb_parser_3_la_LIBADD = $(PARSER_LIBS)
 
 EXTRA_DIST=parser.y lexer.l
 
 gnome_db_test_parser_SOURCES = gnome-db-test-parser.c
-gnome_db_test_parser_LDADD = libgnomedb_parser-3.la $(LIBGNOMEDB_LIBS)
+gnome_db_test_parser_LDADD = libgnomedb_parser-3.la $(PARSER_LIBS)
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/testing/Makefile.am libgnomedb-1.9.100/testing/Makefile.am
--- libgnomedb-1.9.100-orig/testing/Makefile.am	2005-04-10 09:13:40.000000000 -0500
+++ libgnomedb-1.9.100/testing/Makefile.am	2005-11-23 15:52:56.305500000 -0600
@@ -19,32 +19,37 @@
 
 if BUILD_WITH_GNOME
 test_sql_query_SOURCES = test-sql-query.c
-test_sql_query_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS) \
+test_sql_query_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la \
 	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-        $(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la
+	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS)
 
 test_result_set_SOURCES = test-result-set.c
-test_result_set_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS) \
+test_result_set_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la \
 	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-        $(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la
+	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS)
 
 test_dyn_widgets_SOURCES = test-dyn-widgets.c
-test_dyn_widgets_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS) \
+test_dyn_widgets_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la \
 	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-        $(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la
+	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS)
 
 test_handlers_SOURCES = test-handlers.c
-test_handlers_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS) \
+test_handlers_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la \
 	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-        $(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la
+	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS)
 
 test_provider_schemas_SOURCES = test-provider-schemas.c
-test_provider_schemas_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la $(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS) \
+test_provider_schemas_LDADD = $(top_builddir)/libgnomedb/libgnomedb-3.la \
 	$(top_builddir)/libgnomedb/handlers/libgnomedb_handlers-3.la \
-        $(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
-        $(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la
+	$(top_builddir)/libgnomedb/graph/libgnomedb_graph-3.la \
+	$(top_builddir)/libgnomedb/parser/libgnomedb_parser-3.la \
+	$(LIBGNOMEDB_LIBS) $(WITHGNOME_LIBS) $(LIBGLADE_LIBS)
 endif
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/win32/Makefile.am libgnomedb-1.9.100/win32/Makefile.am
--- libgnomedb-1.9.100-orig/win32/Makefile.am	1969-12-31 18:00:00.000000000 -0600
+++ libgnomedb-1.9.100/win32/Makefile.am	2005-11-28 14:35:38.008625000 -0600
@@ -0,0 +1,43 @@
+#
+# The .def files were manually generated as follows:
+#
+# echo "EXPORTS" > $lib.def
+# nm $lib.{a,so} | grep ' T _' | sed 's/.* T _/\t/' | sort -bu >> $lib.def
+#
+
+EXTRA_DIST =					\
+	dummy.la					\
+	libgnomedb_graph-3.def		\
+	libgnomedb_handlers-3.def
+
+if PLATFORM_WIN32
+
+BOOTSTRAP_LIBS =				\
+	libgnomedb_graph-3.la		\
+	libgnomedb_handlers-3.la
+
+noinst_DATA = $(BOOTSTRAP_LIBS)
+
+libgnomedb_graph-3.la: dummy.la libgnomedb_graph-3.def
+	mkdir -p .libs
+	dlltool --output-lib=.libs/libgnomedb_graph-3.dll.a --dllname=$(SOPREFIX)gnomedb_graph-3-4.dll --input-def=$(srcdir)/libgnomedb_graph-3.def
+	sed -e s!%DLL%!$(SOPREFIX)gnomedb_graph-3-4! -e s!%LIB%!libgnomedb_graph-3! -e s!%PFX%!$(prefix)! < $(srcdir)/dummy.la > $@
+
+libgnomedb_handlers-3.la: dummy.la libgnomedb_handlers-3.def
+	mkdir -p .libs
+	dlltool --output-lib=.libs/libgnomedb_handlers-3.dll.a --dllname=$(SOPREFIX)gnomedb_handlers-3-4.dll --input-def=$(srcdir)/libgnomedb_handlers-3.def
+	sed -e s!%DLL%!$(SOPREFIX)gnomedb_handlers-3-4! -e s!%LIB%!libgnomedb_handlers-3! -e s!%PFX%!$(prefix)! < $(srcdir)/dummy.la > $@
+
+
+install-exec-local: $(BOOTSTRAP_LIBS)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for la in $(BOOTSTRAP_LIBS) ; do \
+		implib=`echo $$la | sed -e s!\.la!.dll.a!` ; \
+		$(INSTALL) .libs/$$implib $(DESTDIR)$(libdir) ; \
+		sed -e s!installed=no!installed=yes! < $$la > $(DESTDIR)$(libdir)/$$la ; \
+	done
+
+
+CLEANFILES = $(BOOTSTRAP_LIBS)
+
+endif
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/win32/dummy.la libgnomedb-1.9.100/win32/dummy.la
--- libgnomedb-1.9.100-orig/win32/dummy.la	1969-12-31 18:00:00.000000000 -0600
+++ libgnomedb-1.9.100/win32/dummy.la	2005-11-23 15:26:56.227375000 -0600
@@ -0,0 +1,32 @@
+# %LIB%.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool - well, actually not, hacked manually
+
+# The name that we can dlopen(3).
+dlname='%DLL%.dll'
+
+# Names of this library.
+library_names='%LIB%.dll.a'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Version information for %LIB%
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=no
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='%PFX%/lib'
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/win32/libgnomedb_graph-3.def libgnomedb-1.9.100/win32/libgnomedb_graph-3.def
--- libgnomedb-1.9.100-orig/win32/libgnomedb_graph-3.def	1969-12-31 18:00:00.000000000 -0600
+++ libgnomedb-1.9.100/win32/libgnomedb_graph-3.def	2005-11-23 15:23:54.946125000 -0600
@@ -0,0 +1,46 @@
+EXPORTS
+	gnome_db_canvas_cursor_get_type
+	gnome_db_canvas_db_relations_get_type
+	gnome_db_canvas_db_relations_new
+	gnome_db_canvas_declare_item
+	gnome_db_canvas_entity_get_field_item
+	gnome_db_canvas_entity_get_field_ypos
+	gnome_db_canvas_entity_get_type
+	gnome_db_canvas_field_get_field
+	gnome_db_canvas_field_get_parent_item
+	gnome_db_canvas_field_get_type
+	gnome_db_canvas_fit_zoom_factor
+	gnome_db_canvas_fkconstraint_add_constraint
+	gnome_db_canvas_fkconstraint_get_type
+	gnome_db_canvas_get_graph
+	gnome_db_canvas_get_item_for_object
+	gnome_db_canvas_get_type
+	gnome_db_canvas_get_zoom_factor
+	gnome_db_canvas_item_get_canvas
+	gnome_db_canvas_item_get_graph_item
+	gnome_db_canvas_item_get_type
+	gnome_db_canvas_join_get_type
+	gnome_db_canvas_query_struct_get_type
+	gnome_db_canvas_query_struct_new
+	gnome_db_canvas_set_in_scrolled_window
+	gnome_db_canvas_set_zoom_factor
+	gnome_db_canvas_text_get_type
+	gnome_db_canvas_text_set_highlight
+	gnome_db_canvas_tip_get_type
+	gnome_db_graph_add_item
+	gnome_db_graph_del_item
+	gnome_db_graph_error_quark
+	gnome_db_graph_get_graph_type
+	gnome_db_graph_get_item_from_obj
+	gnome_db_graph_get_items
+	gnome_db_graph_get_type
+	gnome_db_graph_item_error_quark
+	gnome_db_graph_item_get_position
+	gnome_db_graph_item_get_ref_object
+	gnome_db_graph_item_get_type
+	gnome_db_graph_item_new
+	gnome_db_graph_item_set_position
+	gnome_db_graph_new
+	gnome_db_graph_query_get_type
+	gnome_db_graph_query_new
+	gnome_db_graph_query_sync_targets
diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x doc libgnomedb-1.9.100-orig/win32/libgnomedb_handlers-3.def libgnomedb-1.9.100/win32/libgnomedb_handlers-3.def
--- libgnomedb-1.9.100-orig/win32/libgnomedb_handlers-3.def	1969-12-31 18:00:00.000000000 -0600
+++ libgnomedb-1.9.100/win32/libgnomedb_handlers-3.def	2005-11-23 15:23:13.586750000 -0600
@@ -0,0 +1,38 @@
+EXPORTS
+	gnome_db_data_cell_renderer_boolean_get_type
+	gnome_db_data_cell_renderer_boolean_new
+	gnome_db_data_cell_renderer_combo_get_type
+	gnome_db_data_cell_renderer_combo_new
+	gnome_db_data_cell_renderer_info_get_type
+	gnome_db_data_cell_renderer_info_new
+	gnome_db_data_cell_renderer_textual_get_type
+	gnome_db_data_cell_renderer_textual_new
+	gnome_db_entry_boolean_get_type
+	gnome_db_entry_boolean_new
+	gnome_db_entry_combo_get_type
+	gnome_db_entry_combo_get_values
+	gnome_db_entry_combo_get_values_orig
+	gnome_db_entry_combo_new
+	gnome_db_entry_combo_set_values
+	gnome_db_entry_combo_set_values_default
+	gnome_db_entry_combo_set_values_orig
+	gnome_db_entry_none_get_type
+	gnome_db_entry_none_new
+	gnome_db_entry_shell_get_type
+	gnome_db_entry_shell_pack_entry
+	gnome_db_entry_shell_refresh
+	gnome_db_entry_string_get_type
+	gnome_db_entry_string_new
+	gnome_db_entry_time_get_type
+	gnome_db_entry_time_new
+	gnome_db_entry_wrapper_get_type
+	gnome_db_handler_boolean_get_type
+	gnome_db_handler_boolean_new
+	gnome_db_handler_none_get_type
+	gnome_db_handler_none_new
+	gnome_db_handler_numerical_get_type
+	gnome_db_handler_numerical_new
+	gnome_db_handler_string_get_type
+	gnome_db_handler_string_new
+	gnome_db_handler_time_get_type
+	gnome_db_handler_time_new
