diff -Naurp bonobo-1.0.22/bonobo/Makefile.in bonobo-1.0.22-cygwin/bonobo/Makefile.in
--- bonobo-1.0.22/bonobo/Makefile.in	2002-12-01 02:33:01.000000000 +0000
+++ bonobo-1.0.22-cygwin/bonobo/Makefile.in	2002-12-15 17:06:00.000000000 +0000
@@ -573,12 +573,15 @@ maintainer-clean-libtool:
 
 libbonobo.la: $(libbonobo_la_OBJECTS) $(libbonobo_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libbonobo_la_LDFLAGS) $(libbonobo_la_OBJECTS) $(libbonobo_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/mkdll.sh $@ $$(gnome-config --libs gnomeui oaf)
 
 libbonobox.la: $(libbonobox_la_OBJECTS) $(libbonobox_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libbonobox_la_LDFLAGS) $(libbonobox_la_OBJECTS) $(libbonobox_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/mkdll.sh $@ .libs/libbonobo.dll.a  $$(gnome-config --libs gnomeui oaf gdk_pixbuf xml)
 
 libbonobo-print.la: $(libbonobo_print_la_OBJECTS) $(libbonobo_print_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libbonobo_print_la_LDFLAGS) $(libbonobo_print_la_OBJECTS) $(libbonobo_print_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/mkdll.sh $@ .libs/libbonobox.dll.a -L$(libdir) -lgnomeprint .libs/libbonobo.dll.a $$(gnome-config --libs gnomeui oaf gdk_pixbuf xml)
 
 install-libbonobo_printincludeHEADERS: $(libbonobo_printinclude_HEADERS)
 	@$(NORMAL_INSTALL)
diff -Naurp bonobo-1.0.22/bonobo/bonobo-storage-plugin.c bonobo-1.0.22-cygwin/bonobo/bonobo-storage-plugin.c
--- bonobo-1.0.22/bonobo/bonobo-storage-plugin.c	2000-11-27 11:19:56.000000000 +0000
+++ bonobo-1.0.22-cygwin/bonobo/bonobo-storage-plugin.c	2002-12-15 17:06:00.000000000 +0000
@@ -17,7 +17,11 @@
 #include <libgnome/gnome-util.h>
 #include "bonobo-storage-plugin.h"
 
+#ifndef __CYGWIN__
 #define PLUGIN_PREFIX "libstorage_"
+#else
+#define PLUGIN_PREFIX "cygstorage_"
+#endif
 
 GList *storage_plugin_list = NULL;
 
@@ -87,10 +91,18 @@ bonobo_storage_load_plugins (void)
 		while ((de = readdir (dir)) != NULL){
 			len = strlen (de->d_name);
 
+#ifndef __CYGWIN__
 			if (len > (strlen (PLUGIN_PREFIX) + 3) &&
+#else
+			if (len > (strlen (PLUGIN_PREFIX) + 4) &&
+#endif
 			    strncmp (de->d_name, PLUGIN_PREFIX, 
 				     strlen (PLUGIN_PREFIX)) == 0 &&
+#ifndef __CYGWIN__
 			    strncmp (de->d_name + len - 3, ".so", 3) == 0) {
+#else
+			    strncmp (de->d_name + len - 4, ".dll", 4) == 0) {
+#endif
 				plugin_name = g_concat_dir_and_file (path, de->d_name);
 				plugin_load (plugin_name);
 				g_free (plugin_name);
diff -Naurp bonobo-1.0.22/bonobo.spec.in bonobo-1.0.22-cygwin/bonobo.spec.in
--- bonobo-1.0.22/bonobo.spec.in	2001-09-24 06:10:57.000000000 +0100
+++ bonobo-1.0.22-cygwin/bonobo.spec.in	2002-12-15 17:06:00.000000000 +0000
@@ -79,8 +79,8 @@ make -k prefix=$RPM_BUILD_ROOT/%{_prefix
 %{_libdir}/pkgconfig/*
 %dir %{_libdir}/bonobo
 %dir %{_libdir}/bonobo/monikers
-%{_libdir}/bonobo/monikers/*.so.*
-%{_libdir}/*.so.*
+%{_libdir}/bonobo/monikers/*.dll.*
+%{_libdir}/*.dll.*
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
 %{_datadir}/bonobo
 %{_datadir}/idl/*
@@ -94,10 +94,10 @@ make -k prefix=$RPM_BUILD_ROOT/%{_prefix
 %defattr(-, root, root)
 %{_includedir}/*
 %{_libdir}/*a
-%{_libdir}/*.so
+%{_libdir}/*.dll
 %{_libdir}/*.sh
 %{_libdir}/bonobo/plugin
-%{_libdir}/bonobo/monikers/*.so
+%{_libdir}/bonobo/monikers/*.dll
 %{_libdir}/bonobo/monikers/*a
 
 
diff -Naurp bonobo-1.0.22/components/application-x-gnomine/Makefile.in bonobo-1.0.22-cygwin/components/application-x-gnomine/Makefile.in
--- bonobo-1.0.22/components/application-x-gnomine/Makefile.in	2002-12-01 02:33:05.000000000 +0000
+++ bonobo-1.0.22-cygwin/components/application-x-gnomine/Makefile.in	2002-12-16 14:35:03.000000000 +0000
@@ -197,8 +197,8 @@ bonobo_application_x_mines_SOURCES = \
 
 
 bonobo_application_x_mines_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)
 
 
@@ -284,9 +284,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/components/audio-ulaw/Makefile.in bonobo-1.0.22-cygwin/components/audio-ulaw/Makefile.in
--- bonobo-1.0.22/components/audio-ulaw/Makefile.in	2002-12-01 02:33:06.000000000 +0000
+++ bonobo-1.0.22-cygwin/components/audio-ulaw/Makefile.in	2002-12-16 14:35:54.000000000 +0000
@@ -186,8 +186,8 @@ INCLUDES = \
 
 
 bonobo_audio_ulaw_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)			\
 	$(INTLLIBS)
 
@@ -251,9 +251,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/components/selector/Makefile.in bonobo-1.0.22-cygwin/components/selector/Makefile.in
--- bonobo-1.0.22/components/selector/Makefile.in	2002-12-01 02:33:04.000000000 +0000
+++ bonobo-1.0.22-cygwin/components/selector/Makefile.in	2002-12-16 14:36:34.000000000 +0000
@@ -179,8 +179,8 @@ INCLUDES = \
 
 
 bonobo_selector_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)			\
 	$(INTLLIBS)
 
@@ -243,9 +243,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/components/text-plain/Makefile.in bonobo-1.0.22-cygwin/components/text-plain/Makefile.in
--- bonobo-1.0.22/components/text-plain/Makefile.in	2002-12-01 02:33:05.000000000 +0000
+++ bonobo-1.0.22-cygwin/components/text-plain/Makefile.in	2002-12-16 14:37:19.000000000 +0000
@@ -179,8 +179,8 @@ INCLUDES = \
 
 
 bonobo_text_plain_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)			\
 	$(INTLLIBS)
 
@@ -243,9 +243,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/configure bonobo-1.0.22-cygwin/configure
--- bonobo-1.0.22/configure	2002-12-01 02:32:08.000000000 +0000
+++ bonobo-1.0.22-cygwin/configure	2002-12-15 17:06:00.000000000 +0000
@@ -5280,7 +5280,8 @@ EOF
       else $CC -o impgen impgen.c ; fi)~
       $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
 
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+#    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+old_archive_from_expsyms_cmds=
 
     # cygwin and mingw dlls have different entry points and sets of symbols
     # to exclude.
@@ -7064,7 +7065,8 @@ old_postuninstall_cmds=$lt_old_postunins
 old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
 # Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+#old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+old_archive_from_expsyms_cmds=
 
 # Commands used to build and install a shared archive.
 archive_cmds=$lt_archive_cmds
diff -Naurp bonobo-1.0.22/gshell/Makefile.in bonobo-1.0.22-cygwin/gshell/Makefile.in
--- bonobo-1.0.22/gshell/Makefile.in	2002-12-01 02:33:11.000000000 +0000
+++ bonobo-1.0.22-cygwin/gshell/Makefile.in	2002-12-16 14:37:54.000000000 +0000
@@ -192,8 +192,8 @@ uidir = $(datadir)/gnome/ui
 ui_DATA = gshell-ui.xml
 
 gshell_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)			\
         $(INTLLIBS)
 
@@ -253,9 +253,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/libefs/configure bonobo-1.0.22-cygwin/libefs/configure
--- bonobo-1.0.22/libefs/configure	2002-12-01 02:32:11.000000000 +0000
+++ bonobo-1.0.22-cygwin/libefs/configure	2002-12-15 17:06:00.000000000 +0000
@@ -4300,7 +4300,8 @@ EOF
       else $CC -o impgen impgen.c ; fi)~
       $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
 
-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+#    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+old_archive_from_expsyms_cmds=
 
     # cygwin and mingw dlls have different entry points and sets of symbols
     # to exclude.
@@ -6084,7 +6085,8 @@ old_postuninstall_cmds=$lt_old_postunins
 old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
 # Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+#old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+old_archive_from_expsyms_cmds=
 
 # Commands used to build and install a shared archive.
 archive_cmds=$lt_archive_cmds
diff -Naurp bonobo-1.0.22/libefs/src/Makefile.in bonobo-1.0.22-cygwin/libefs/src/Makefile.in
--- bonobo-1.0.22/libefs/src/Makefile.in	2002-12-01 02:32:59.000000000 +0000
+++ bonobo-1.0.22-cygwin/libefs/src/Makefile.in	2002-12-15 17:06:00.000000000 +0000
@@ -241,6 +241,7 @@ maintainer-clean-libtool:
 
 libefs.la: $(libefs_la_OBJECTS) $(libefs_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libefs_la_LDFLAGS) $(libefs_la_OBJECTS) $(libefs_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/../mkdll.sh $@ $$(glib-config --libs) -lz -lcrypt
 
 mostlyclean-binPROGRAMS:
 
@@ -255,9 +256,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/mkdll.sh bonobo-1.0.22-cygwin/mkdll.sh
--- bonobo-1.0.22/mkdll.sh	1970-01-01 00:00:00.000000000 +0000
+++ bonobo-1.0.22-cygwin/mkdll.sh	2002-12-15 17:06:00.000000000 +0000
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# script to generate dll from libtool-generated static archive (.la file)
+# invoke with:
+# mkdll.sh <archive.la> <dependency libs>
+# eg:
+# mkdll.sh libtest.la -L/usr/local/lib -llocal
+
+# defaults to using gcc for libraries written in C.
+# set the CC env var to use a different compiler driver: eg
+# export CC=g++ 
+# for C++ libraries
+
+# defaults to using /usr/local as the installation PREFIX
+# override this by setting the PREFIX env var: eg
+# export PREFIX=/opt/gnome
+
+archive=$1
+test -f $archive || { echo $(basename $0): $archive not found; exit 1; }
+
+module=$(echo $(basename $archive) | sed -e 's,^lib,,' -e 's,.la$,,')
+
+shift
+dependency_libs="$@"
+
+test -n "$CC" || CC=gcc
+prefix=${PREFIX:=/usr/local}
+case "$DLDIR" in
+   :) dldir=
+      ;;
+   "") dldir=../bin/
+      ;;
+   *) dldir=$DLDIR
+      ;;
+esac
+case "$DLPREFIX" in
+   :) dlprefix=
+      ;;
+   "") dlprefix=cyg
+      ;;
+   *) dlprefix=$DLPREFIX
+      ;;
+esac
+case "$LIBPREFIX" in
+   :) libprefix=
+      ;;
+   "") libprefix=lib
+      ;;
+   *) libprefix=$LIBPREFIX
+      ;;
+esac
+
+# get the static library name
+# first look in the .la archive
+old_lib=$(sed -ne '/^old_library=/ s,^old_library='\''\(.*\)'\''.*$,\1,p' .libs/$archive)
+# if not there, use default name
+test -n "$old_lib" || old_lib=${libprefix}${module}.a
+
+
+
+# update the archive with the dll and import lib name; fix install dir; remove relink command
+# (${prefix}/lib is hard-coded here - edit it if necessary)
+libdir=${prefix}/lib
+if sed -e 's,^dlname='\'\'',dlname='\'${dlprefix}${module}.dll\'',' \
+       -e 's,^library_names='\'\'',library_names='\'${libprefix}${module}.dll.a\'',' \
+       -e 's,^libdir='\'\'',libdir='\'$libdir\'',' \
+       -e 's,^relink_command=.*$,,' \
+       .libs/$archive > .libs/${archive}.tmp
+then cat .libs/${archive}.tmp > .libs/${archive}
+fi
+rm -f .libs/${archive}.tmp
+
+# update the install archive if it exists
+if [ -f .libs/${archive}i ] ; then
+	if sed -e 's,^dlname='\'\'',dlname='\'${dldir}${dlprefix}${module}.dll\'',' \
+	       -e 's,^library_names='\'\'',library_names='\'${libprefix}${module}.dll.a\'',' \
+          -e 's,^relink_command=.*$,,' \
+	       .libs/${archive}i > .libs/${archive}i.tmp
+	then cat .libs/${archive}i.tmp > .libs/${archive}i
+	fi
+	rm -f .libs/${archive}i.tmp
+fi
+
+
+# report the link command to stdout
+eval echo $CC -shared -o .libs/${dlprefix}${module}.dll -Wl,--out-implib=.libs/${libprefix}${module}.dll.a \
+-Wl,--export-all-symbols -Wl,--whole-archive .libs/$old_lib -Wl,--no-whole-archive ${dependency_libs}
+
+# do the link command - if it fails, remove archive so make knows to re-build it
+eval $CC -shared -o .libs/${dlprefix}${module}.dll -Wl,--out-implib=.libs/${libprefix}${module}.dll.a -Wl,--export-all-symbols \
+-Wl,--whole-archive .libs/$old_lib -Wl,--no-whole-archive ${dependency_libs} || { rm -f $archive; false; }
+ret=$?
+
+# copy the .dll.a file to .dll.aT to keep libtool happy
+rm -f .libs/${libprefix}${module}.dll.aT
+ln .libs/${libprefix}${module}.dll.a .libs/${libprefix}${module}.dll.aT
+
+exit $ret
diff -Naurp bonobo-1.0.22/monikers/Bonobo_Moniker_std.oaf.in.in bonobo-1.0.22-cygwin/monikers/Bonobo_Moniker_std.oaf.in.in
--- bonobo-1.0.22/monikers/Bonobo_Moniker_std.oaf.in.in	2001-01-25 09:26:21.000000000 +0000
+++ bonobo-1.0.22-cygwin/monikers/Bonobo_Moniker_std.oaf.in.in	2002-12-15 17:06:00.000000000 +0000
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Moniker_std_Factory"
-	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_std.so">
+	type="shlib" location="@MONIKER_LIBDIR@/cygmoniker_std.dll">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/GenericFactory:1.0"/>
 	</oaf_attribute>
diff -Naurp bonobo-1.0.22/monikers/Makefile.in bonobo-1.0.22-cygwin/monikers/Makefile.in
--- bonobo-1.0.22/monikers/Makefile.in	2002-12-01 02:33:03.000000000 +0000
+++ bonobo-1.0.22-cygwin/monikers/Makefile.in	2002-12-16 14:38:33.000000000 +0000
@@ -200,8 +200,8 @@ bin_PROGRAMS = \
 #noinst_PROGRAMS = moniker-control-test moniker-test
 
 moniker_ldadd = \
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)
 
 
@@ -388,6 +388,7 @@ maintainer-clean-libtool:
 
 libmoniker_std.la: $(libmoniker_std_la_OBJECTS) $(libmoniker_std_la_DEPENDENCIES)
 	$(LINK) -rpath $(monikerdir) $(libmoniker_std_la_LDFLAGS) $(libmoniker_std_la_OBJECTS) $(libmoniker_std_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) DLDIR=":" sh $(top_srcdir)/mkdll.sh $@ $(top_builddir)/bonobo/.libs/libbonobo.dll.a $$(gnome-config --libs gnomeui oaf)
 
 mostlyclean-binPROGRAMS:
 
@@ -402,9 +403,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/samples/bonobo-class/Makefile.in bonobo-1.0.22-cygwin/samples/bonobo-class/Makefile.in
--- bonobo-1.0.22/samples/bonobo-class/Makefile.in	2002-12-01 02:33:11.000000000 +0000
+++ bonobo-1.0.22-cygwin/samples/bonobo-class/Makefile.in	2002-12-16 14:39:13.000000000 +0000
@@ -179,8 +179,8 @@ bonobo_echo_SOURCES = \
 
 bonobo_echo_LDADD = \
 	libEcho.a				\
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)			\
 	$(INTLLIBS)
 
@@ -347,9 +347,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/samples/compound-doc/Makefile.in bonobo-1.0.22-cygwin/samples/compound-doc/Makefile.in
--- bonobo-1.0.22/samples/compound-doc/Makefile.in	2002-12-01 02:33:09.000000000 +0000
+++ bonobo-1.0.22-cygwin/samples/compound-doc/Makefile.in	2002-12-16 14:41:30.000000000 +0000
@@ -183,8 +183,8 @@ bonobo_sample_paint_SOURCES = \
 
 
 bonobo_sample_paint_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobox.la		\
+	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobo-print.la	\
 	$(BONOBOX_TEST_LIBS)				\
 	$(INTLLIBS)
@@ -195,8 +195,8 @@ bonobo_sample_canvas_item_SOURCES = \
 
 
 bonobo_sample_canvas_item_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la	\
 	$(top_builddir)/bonobo/libbonobox.la	\
+	$(top_builddir)/bonobo/libbonobo.la	\
 	$(BONOBOX_TEST_LIBS)			\
 	$(INTLLIBS)
 
@@ -269,9 +269,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/samples/compound-doc/bonobo-hello/Makefile.in bonobo-1.0.22-cygwin/samples/compound-doc/bonobo-hello/Makefile.in
--- bonobo-1.0.22/samples/compound-doc/bonobo-hello/Makefile.in	2002-12-01 02:33:10.000000000 +0000
+++ bonobo-1.0.22-cygwin/samples/compound-doc/bonobo-hello/Makefile.in	2002-12-16 14:39:54.000000000 +0000
@@ -189,8 +189,8 @@ bonobo_sample_hello_SOURCES = \
 
 
 bonobo_sample_hello_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobox.la		\
+	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobo-print.la	\
 	$(BONOBOX_TEST_LIBS)				\
 	$(INTLLIBS)
@@ -256,9 +256,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/samples/compound-doc/container/Makefile.in bonobo-1.0.22-cygwin/samples/compound-doc/container/Makefile.in
--- bonobo-1.0.22/samples/compound-doc/container/Makefile.in	2002-12-01 02:33:09.000000000 +0000
+++ bonobo-1.0.22-cygwin/samples/compound-doc/container/Makefile.in	2002-12-16 14:40:34.000000000 +0000
@@ -194,8 +194,8 @@ sample_container_SOURCES = \
 
 
 sample_container_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobox.la		\
+	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobo-print.la	\
 	$(BONOBOX_TEST_LIBS)				\
 	$(INTLLIBS)
@@ -255,9 +255,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/samples/controls/Makefile.in bonobo-1.0.22-cygwin/samples/controls/Makefile.in
--- bonobo-1.0.22/samples/controls/Makefile.in	2002-12-01 02:33:08.000000000 +0000
+++ bonobo-1.0.22-cygwin/samples/controls/Makefile.in	2002-12-16 14:42:21.000000000 +0000
@@ -183,8 +183,8 @@ bonobo_sample_controls_SOURCES = \
 
 
 bonobo_sample_controls_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobox.la		\
+	$(top_builddir)/bonobo/libbonobo.la		\
 	$(BONOBOX_TEST_LIBS)				\
 	$(INTLLIBS)
 
@@ -194,8 +194,8 @@ sample_control_container_SOURCES = \
 
 
 sample_control_container_LDADD = \
-	$(top_builddir)/bonobo/libbonobo.la		\
 	$(top_builddir)/bonobo/libbonobox.la		\
+	$(top_builddir)/bonobo/libbonobo.la		\
 	$(BONOBOX_TEST_LIBS)				\
 	$(INTLLIBS)
 
@@ -266,9 +266,9 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  if test -f .libs/$$p; then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
diff -Naurp bonobo-1.0.22/storage-modules/Makefile.in bonobo-1.0.22-cygwin/storage-modules/Makefile.in
--- bonobo-1.0.22/storage-modules/Makefile.in	2002-12-01 02:33:02.000000000 +0000
+++ bonobo-1.0.22-cygwin/storage-modules/Makefile.in	2002-12-15 17:06:00.000000000 +0000
@@ -365,12 +365,15 @@ maintainer-clean-libtool:
 
 libstorage_efs.la: $(libstorage_efs_la_OBJECTS) $(libstorage_efs_la_DEPENDENCIES)
 	$(LINK) -rpath $(bonobo_plugindir) $(libstorage_efs_la_LDFLAGS) $(libstorage_efs_la_OBJECTS) $(libstorage_efs_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) DLDIR=":" sh $(top_srcdir)/mkdll.sh $@ $(top_builddir)/bonobo/.libs/libbonobo.dll.a $$(gnome-config --libs gnomeui oaf) $(top_builddir)/libefs/src/.libs/libefs.dll.a
 
 libstorage_fs.la: $(libstorage_fs_la_OBJECTS) $(libstorage_fs_la_DEPENDENCIES)
 	$(LINK) -rpath $(bonobo_plugindir) $(libstorage_fs_la_LDFLAGS) $(libstorage_fs_la_OBJECTS) $(libstorage_fs_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) DLDIR=":" sh $(top_srcdir)/mkdll.sh $@  $(top_builddir)/bonobo/.libs/libbonobo.dll.a $$(gnome-config --libs gnomeui oaf)
 
 libstorage_vfs.la: $(libstorage_vfs_la_OBJECTS) $(libstorage_vfs_la_DEPENDENCIES)
 	$(LINK) -rpath $(libstoragedir) $(libstorage_vfs_la_LDFLAGS) $(libstorage_vfs_la_OBJECTS) $(libstorage_vfs_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) DLDIR=":" sh $(top_srcdir)/mkdll.sh $@  $(top_builddir)/bonobo/.libs/libbonobo.dll.a $$(gnome-config --libs gnomeui oaf)
 
 tags: TAGS
 
diff -Naurp bonobo-1.0.22/storage-modules/bonobo-stream-fs.c bonobo-1.0.22-cygwin/storage-modules/bonobo-stream-fs.c
--- bonobo-1.0.22/storage-modules/bonobo-stream-fs.c	2001-02-20 15:52:02.000000000 +0000
+++ bonobo-1.0.22-cygwin/storage-modules/bonobo-stream-fs.c	2002-12-15 17:06:00.000000000 +0000
@@ -104,7 +104,11 @@ fs_write (BonoboStream *stream, const Bo
 
 	if (errno == EINTR) return;
 
+#ifdef __CYGWIN__
+	if ((errno == EBADF) || (errno == EINVAL) || (errno == EACCES))
+#else
 	if ((errno == EBADF) || (errno == EINVAL))
+#endif
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, 
 				     ex_Bonobo_Stream_NoPermission, NULL);
 	else 
diff -Naurp bonobo-1.0.22/tests/Makefile.in bonobo-1.0.22-cygwin/tests/Makefile.in
--- bonobo-1.0.22/tests/Makefile.in	2002-12-01 02:33:12.000000000 +0000
+++ bonobo-1.0.22-cygwin/tests/Makefile.in	2002-12-16 14:47:20.000000000 +0000
@@ -181,8 +181,9 @@ noinst_PROGRAMS = \
 
 
 bonobo_libs = \
-	$(top_builddir)/bonobo/libbonobo.la		\
 	$(BONOBOX_TEST_LIBS)				\
+	$(top_builddir)/bonobo/libbonobo.la		\
+	$$(gnome-config --libs gnomeui oaf)		\
 	$(INTLLIBS)
 
 
@@ -217,35 +218,35 @@ test_storage_LDADD = $(bonobo_libs)
 test_any_SOURCES = test-any.c
 
 test_any_LDADD = \
-	$(bonobo_libs)					\
-	$(top_builddir)/bonobo/libbonobox.la
+	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)
 
 
 test_ui_SOURCES = test-ui.c
 test_ui_LDADD = \
-	$(bonobo_libs)					\
 	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)					\
 	$(top_builddir)/bonobo/libbonobo-print.la
 
 
 test_focus_SOURCES = test-focus.c
 test_focus_LDADD = \
-	$(bonobo_libs)					\
-	$(top_builddir)/bonobo/libbonobox.la
+	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)
 
 
 test_toolbar_SOURCES = test-toolbar.c
 test_toolbar_LDADD = \
-	$(bonobo_libs)					\
 	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)					\
 	$(top_builddir)/bonobo/libbonobo-print.la
 
 
 test_moniker_SOURCES = test-moniker.c
 
 test_moniker_LDADD = \
-	$(bonobo_libs)					\
-	$(top_builddir)/bonobo/libbonobox.la
+	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)
 
 
 #
@@ -263,27 +264,27 @@ selector_test_SOURCES = \
 
 
 selector_test_LDADD = \
-	$(bonobo_libs)					\
-	$(top_builddir)/bonobo/libbonobox.la
+	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)
 
 
 test_event_source_SOURCES = test-event-source.c
 
 test_event_source_LDADD = \
-	$(bonobo_libs)					\
-	$(top_builddir)/bonobo/libbonobox.la
+	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)
 
 
 test_sensitivity_SOURCES = test-sensitivity.c
 test_sensitivity_LDADD = \
-	$(bonobo_libs)					\
-	$(top_builddir)/bonobo/libbonobox.la
+	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)
 
 
 test_reparent_SOURCES = test-reparent.c
 test_reparent_LDADD = \
-	$(bonobo_libs)					\
-	$(top_builddir)/bonobo/libbonobox.la
+	$(top_builddir)/bonobo/libbonobox.la		\
+	$(bonobo_libs)
 
 
 test_xobject_SOURCES = \
diff -Naurp bonobo-1.0.22/tests/test-any.c bonobo-1.0.22-cygwin/tests/test-any.c
--- bonobo-1.0.22/tests/test-any.c	2002-01-28 10:54:07.000000000 +0000
+++ bonobo-1.0.22-cygwin/tests/test-any.c	2002-12-15 17:06:00.000000000 +0000
@@ -179,7 +179,7 @@ main (int argc, char *argv [])
 		int            i;
 		CORBA_TypeCode tcs [] = {
 			TC_null,
-			TC_void,
+/*			TC_void, */
 			TC_string,
 			TC_short,
 			TC_long,
diff -Naurp bonobo-1.0.22/tests/test-storage.c bonobo-1.0.22-cygwin/tests/test-storage.c
--- bonobo-1.0.22/tests/test-storage.c	2001-09-24 03:24:54.000000000 +0100
+++ bonobo-1.0.22-cygwin/tests/test-storage.c	2002-12-15 17:06:00.000000000 +0000
@@ -50,10 +50,14 @@ basic_io_tests (CORBA_Object storage, CO
 	CHECK_EXCEPTION (ev, ex_Bonobo_Storage_NotFound);
 
 	/* create a new file */
-	Bonobo_Storage_openStream (storage, "test5.txt",
+	stream = Bonobo_Storage_openStream (storage, "test5.txt",
 				   Bonobo_Storage_CREATE, ev);
 	NO_EXCEPTION (ev);
 	
+	/* close the file */
+	bonobo_object_release_unref (stream, ev);
+	NO_EXCEPTION (ev);
+
 	/* create a new file */
 	stream = Bonobo_Storage_openStream (storage, "test1.txt",
 					    Bonobo_Storage_CREATE, ev);
@@ -108,6 +112,10 @@ basic_io_tests (CORBA_Object storage, CO
 					    Bonobo_Storage_READ, ev);
 	NO_EXCEPTION (ev);
 
+	/* close the file */
+	bonobo_object_release_unref (stream, ev);
+	NO_EXCEPTION (ev);
+
 	CORBA_exception_free (ev);
 
 	printf ("end basic tests\n");
