diff -Naurp gedit-0.9.7/Makefile.in gedit-0.9.7-cygwin/Makefile.in
--- gedit-0.9.7/Makefile.in	Sun Sep  9 11:34:29 2001
+++ gedit-0.9.7-cygwin/Makefile.in	Thu May  9 15:21:45 2002
@@ -125,7 +125,7 @@ cflags_set = @cflags_set@
 cxxflags_set = @cxxflags_set@
 l = @l@
 
-SUBDIRS = macros po intl pixmaps plugins src help
+SUBDIRS = macros po intl pixmaps src plugins help
 
 EXTRA_DIST = BUGS FAQ ChangeLog README README.plugins 	INSTALL gedit.1 gedit.desktop 	ABOUT-NLS TODO gedit.spec.in gedit.keys app-docs.make
 
diff -Naurp gedit-0.9.7/configure gedit-0.9.7-cygwin/configure
--- gedit-0.9.7/configure	Sun Sep  9 11:34:21 2001
+++ gedit-0.9.7-cygwin/configure	Fri Mar  1 22:06:04 2002
@@ -3478,8 +3478,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.
     # FIXME: what about values for MSVC?
@@ -5175,7 +5175,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
@@ -6560,7 +6561,7 @@ else
   HAVE_LIBZVT_FALSE=
 fi
 
-ALL_LINGUAS="az ca cs da de el es fi fr ga gl hu it ja ko lt nl nn no pl pt pt_BR ru sv sk sl ta tr uk wa zh_TW zh_CN"
+ALL_LINGUAS="az ca cs da de el es fi fr ga gl hu it ja ko lt nl nn no pl pt pt_BR sv sk sl ta tr uk wa zh_TW zh_CN"
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
diff -Naurp gedit-0.9.7/plugins/ASCII/Makefile.in gedit-0.9.7-cygwin/plugins/ASCII/Makefile.in
--- gedit-0.9.7/plugins/ASCII/Makefile.in	Sun Sep  9 11:34:43 2001
+++ gedit-0.9.7-cygwin/plugins/ASCII/Makefile.in	Thu May  9 16:16:03 2002
@@ -251,6 +252,7 @@ maintainer-clean-libtool:
 
 libasciitable.la: $(libasciitable_la_OBJECTS) $(libasciitable_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libasciitable_la_LDFLAGS) $(libasciitable_la_OBJECTS) $(libasciitable_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/browse/Makefile.in gedit-0.9.7-cygwin/plugins/browse/Makefile.in
--- gedit-0.9.7/plugins/browse/Makefile.in	Sun Sep  9 11:34:45 2001
+++ gedit-0.9.7-cygwin/plugins/browse/Makefile.in	Sat Mar 16 16:23:13 2002
@@ -245,9 +245,10 @@ clean-libtool:
 distclean-libtool:
 
 maintainer-clean-libtool:
-
+  
 libbrowse.la: $(libbrowse_la_OBJECTS) $(libbrowse_la_DEPENDENCIES)
-	$(LINK) -rpath $(plugindir) $(libbrowse_la_LDFLAGS) $(libbrowse_la_OBJECTS) $(libbrowse_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(libbrowse_la_LDFLAGS) $(libbrowse_la_OBJECTS) $(libbrowse_la_LIBADD) $(LIBS)				
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/convert/Makefile.in gedit-0.9.7-cygwin/plugins/convert/Makefile.in
--- gedit-0.9.7/plugins/convert/Makefile.in	Sun Sep  9 11:34:46 2001
+++ gedit-0.9.7-cygwin/plugins/convert/Makefile.in	Sat Mar 16 16:52:54 2002
@@ -251,6 +251,7 @@ maintainer-clean-libtool:
 
 libconvert.la: $(libconvert_la_OBJECTS) $(libconvert_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libconvert_la_LDFLAGS) $(libconvert_la_OBJECTS) $(libconvert_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/diff/Makefile.in gedit-0.9.7-cygwin/plugins/diff/Makefile.in
--- gedit-0.9.7/plugins/diff/Makefile.in	Sun Sep  9 11:34:48 2001
+++ gedit-0.9.7-cygwin/plugins/diff/Makefile.in	Sat Mar 16 16:58:09 2002
@@ -248,6 +248,7 @@ maintainer-clean-libtool:
 
 libdiff.la: $(libdiff_la_OBJECTS) $(libdiff_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libdiff_la_LDFLAGS) $(libdiff_la_OBJECTS) $(libdiff_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs vfs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/docinfo/Makefile.in gedit-0.9.7-cygwin/plugins/docinfo/Makefile.in
--- gedit-0.9.7/plugins/docinfo/Makefile.in	Sun Sep  9 11:34:49 2001
+++ gedit-0.9.7-cygwin/plugins/docinfo/Makefile.in	Sat Mar 16 17:06:24 2002
@@ -251,6 +251,7 @@ maintainer-clean-libtool:
 
 libdocinfo.la: $(libdocinfo_la_OBJECTS) $(libdocinfo_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libdocinfo_la_LDFLAGS) $(libdocinfo_la_OBJECTS) $(libdocinfo_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/email/Makefile.in gedit-0.9.7-cygwin/plugins/email/Makefile.in
--- gedit-0.9.7/plugins/email/Makefile.in	Sun Sep  9 11:34:51 2001
+++ gedit-0.9.7-cygwin/plugins/email/Makefile.in	Sat Mar 16 17:08:48 2002
@@ -251,6 +251,7 @@ maintainer-clean-libtool:
 
 libemail.la: $(libemail_la_OBJECTS) $(libemail_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libemail_la_LDFLAGS) $(libemail_la_OBJECTS) $(libemail_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs vfs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/mkdll.sh gedit-0.9.7-cygwin/plugins/mkdll.sh
--- gedit-0.9.7/plugins/mkdll.sh	Thu Jan  1 00:00:00 1970
+++ gedit-0.9.7-cygwin/plugins/mkdll.sh	Sat Mar 16 16:21:57 2002
@@ -0,0 +1,68 @@
+#!/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\(.*\).la$,\1,')
+
+shift
+dependency_libs="$@"
+
+test -n "$CC" || CC=gcc
+prefix=${PREFIX:=/usr/local}
+
+# 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=lib${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='\'cyg${module}.dll\'',' \
+       -e 's,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' \
+       -e '/^libdir=/ s,='\'\'',='\'$libdir\'',' \
+       -e '/^relink_command=/ s,^$,,' \
+       .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='\'cyg${module}.dll\'',' \
+	       -e 's,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' \
+             -e '/^relink_command=/ s,^$,,' \
+	       .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 cyg${module}.dll -Wl,--out-implib=lib${module}.dll.a \
+-Wl,--export-all-symbols -Wl,--whole-archive $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/cyg${module}.dll -Wl,--out-implib=.libs/lib${module}.dll.a -Wl,--export-all-symbols \
+-Wl,--whole-archive .libs/$old_lib -Wl,--no-whole-archive ${dependency_libs} || { rm -f $archive; false; }
+
diff -Naurp gedit-0.9.7/plugins/reverse/Makefile.in gedit-0.9.7-cygwin/plugins/reverse/Makefile.in
--- gedit-0.9.7/plugins/reverse/Makefile.in	Sun Sep  9 11:34:56 2001
+++ gedit-0.9.7-cygwin/plugins/reverse/Makefile.in	Sat Mar 16 17:10:11 2002
@@ -242,6 +242,7 @@ maintainer-clean-libtool:
 
 libreverse.la: $(libreverse_la_OBJECTS) $(libreverse_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libreverse_la_LDFLAGS) $(libreverse_la_OBJECTS) $(libreverse_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs vfs libglade)
 
 tags: TAGS
 
diff -Naurp gedit-0.9.7/plugins/shell_output/Makefile.in gedit-0.9.7-cygwin/plugins/shell_output/Makefile.in
--- gedit-0.9.7/plugins/shell_output/Makefile.in	Sun Sep  9 11:34:57 2001
+++ gedit-0.9.7-cygwin/plugins/shell_output/Makefile.in	Sat Mar 16 17:12:18 2002
@@ -251,6 +251,7 @@ maintainer-clean-libtool:
 
 libshell_output.la: $(libshell_output_la_OBJECTS) $(libshell_output_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libshell_output_la_LDFLAGS) $(libshell_output_la_OBJECTS) $(libshell_output_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs vfs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/sort/Makefile.in gedit-0.9.7-cygwin/plugins/sort/Makefile.in
--- gedit-0.9.7/plugins/sort/Makefile.in	Sun Sep  9 11:34:59 2001
+++ gedit-0.9.7-cygwin/plugins/sort/Makefile.in	Sat Mar 16 17:41:30 2002
@@ -251,6 +251,7 @@ maintainer-clean-libtool:
 
 libsort.la: $(libsort_la_OBJECTS) $(libsort_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libsort_la_LDFLAGS) $(libsort_la_OBJECTS) $(libsort_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs vfs libglade)
 
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
diff -Naurp gedit-0.9.7/plugins/time/Makefile.in gedit-0.9.7-cygwin/plugins/time/Makefile.in
--- gedit-0.9.7/plugins/time/Makefile.in	Sun Sep  9 11:34:54 2001
+++ gedit-0.9.7-cygwin/plugins/time/Makefile.in	Sat Mar 16 17:43:32 2002
@@ -242,6 +242,7 @@ maintainer-clean-libtool:
 
 libtime.la: $(libtime_la_OBJECTS) $(libtime_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libtime_la_LDFLAGS) $(libtime_la_OBJECTS) $(libtime_la_LIBADD) $(LIBS)
+	PREFIX=$(prefix) sh $(top_srcdir)/plugins/mkdll.sh $@ -L$(top_builddir)/src -lgedit $$(gnome-config --libs vfs libglade)
 
 tags: TAGS
 
diff -Naurp gedit-0.9.7/plugins/time/time.c gedit-0.9.7-cygwin/plugins/time/time.c
--- gedit-0.9.7/plugins/time/time.c	Tue May 15 11:17:20 2001
+++ gedit-0.9.7-cygwin/plugins/time/time.c	Sat Mar 16 18:18:36 2002
@@ -46,7 +46,12 @@ get_time (void)
 	
 	  return tmp;
 	*/
+
+#ifndef __CYGWIN__
 	format = "%a %b %e %H:%M:%S %Z %Y";
+#else
+	format = "%a %b %d %H:%M:%S %Z %Y";
+#endif
 
 	do
 	{
diff -Naurp gedit-0.9.7/src/Makefile.in gedit-0.9.7-cygwin/src/Makefile.in
--- gedit-0.9.7/src/Makefile.in	Sun Sep  9 11:35:01 2001
+++ gedit-0.9.7-cygwin/src/Makefile.in	Thu May  9 15:29:25 2002
@@ -138,10 +138,12 @@ INCLUDES =  	-DGNOMELOCALEDIR=\""$(datad
 
 bin_PROGRAMS = gedit
 
-gedit_SOURCES =  	auto.c			auto.h			commands.c		commands.h		debug.c			debug.h			document.c		document.h		file.c 			file.h			gedit.c			menus.c 		menus.h 		plugin.c 		plugin.h 		prefs.c			prefs.h			print.c 		print.h 		print-doc.c		print-doc.h		print-util.c		print-util.h		recent.c		recent.h		search.c 		search.h		undo.c 			undo.h			utils.c 		utils.h 		view.c			view.h			window.c 		window.h
+gedit_exe_SOURCES = gedit.c
 
+gedit_SOURCES =  	auto.c			auto.h			commands.c		commands.h		debug.c			debug.h			document.c		document.h		file.c 			file.h			menus.c 		menus.h 		plugin.c 		plugin.h 		prefs.c			prefs.h			print.c 		print.h 		print-doc.c		print-doc.h		print-util.c		print-util.h		recent.c		recent.h		search.c 		search.h		undo.c 			undo.h			utils.c 		utils.h 		view.c			view.h			window.c 		window.h
 
-gedit_LDADD =  	dialogs/libdialogs.a			$(GNOME_LIBDIR) 			$(GNOMEUI_LIBS) 			$(corba_libs) 				$(libgnorba_libs) 			$(INTLLIBS) 				$(EXTRA_GNOME_LIBS)
+
+gedit_LDADD =  $(GNOME_LIBDIR) 			$(GNOMEUI_LIBS) 			$(corba_libs) 				$(libgnorba_libs) 			$(INTLLIBS) 				$(EXTRA_GNOME_LIBS)
 
 
 EXTRA_DIST = 
@@ -154,8 +156,9 @@ PROGRAMS =  $(bin_PROGRAMS)
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 LIBS = @LIBS@
+gedit_exe_OBJECTS = gedit.$(OBJEXT)
 gedit_OBJECTS =  auto.$(OBJEXT) commands.$(OBJEXT) debug.$(OBJEXT) \
-document.$(OBJEXT) file.$(OBJEXT) gedit.$(OBJEXT) menus.$(OBJEXT) \
+document.$(OBJEXT) file.$(OBJEXT) menus.$(OBJEXT) \
 plugin.$(OBJEXT) prefs.$(OBJEXT) print.$(OBJEXT) print-doc.$(OBJEXT) \
 print-util.$(OBJEXT) recent.$(OBJEXT) search.$(OBJEXT) undo.$(OBJEXT) \
 utils.$(OBJEXT) view.$(OBJEXT) window.$(OBJEXT)
@@ -262,9 +265,25 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-gedit$(EXEEXT): $(gedit_OBJECTS) $(gedit_DEPENDENCIES)
+cyggedit.dll libgedit.dll.a: $(gedit_OBJECTS) $(gedit_DEPENDENCIES)
+	gcc -shared -o cyggedit.dll -Wl,--out-implib=libgedit.dll.a -Wl,--export-all-symbols $(gedit_OBJECTS) 	-Wl,--whole-archive dialogs/libdialogs.a -Wl,--no-whole-archive		$(gedit_LDADD) $(LIBS)
+
+	
+
+gedit$(EXEEXT): libgedit.dll.a $(gedit_exe_OBJECTS)
 	@rm -f gedit$(EXEEXT)
-	$(LINK) $(gedit_LDFLAGS) $(gedit_OBJECTS) $(gedit_LDADD) $(LIBS)
+	$(LINK) $(gedit_LDFLAGS) $(gedit_exe_OBJECTS) $< $(gedit_LDADD) $(LIBS)
+
+install-LIBRARIES: cyggedit.dll
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) cyggedit.dll $(DESTDIR)$(bindir)	
+	$(INSTALL_PROGRAM) libgedit.dll.a $(DESTDIR)$(libdir)	
+
+uninstall-LIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	rm -f $(DESTDIR)$(bindir)/cyggedit.dll
+	rm -f $(DESTDIR)$(libdir)/libgedit.dll.a
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -389,7 +408,7 @@ check-am: all-am
 check: check-recursive
 installcheck-am:
 installcheck: installcheck-recursive
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-LIBRARIES
 install-exec: install-exec-recursive
 
 install-data-am:
@@ -398,7 +417,7 @@ install-data: install-data-recursive
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-LIBRARIES   
 uninstall: uninstall-recursive
 all-am: Makefile $(PROGRAMS)
 all-redirect: all-recursive
@@ -459,7 +478,8 @@ dvi-am dvi check check-am installcheck-a
 install-exec install-data-am install-data install-am install \
 uninstall-am uninstall all-redirect all-am all installdirs-am \
 installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean \
+install-LIBRARIES uninstall-LIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Naurp gedit-0.9.7/src/plugin.c gedit-0.9.7-cygwin/src/plugin.c
--- gedit-0.9.7/src/plugin.c	Thu May 10 11:11:03 2001
+++ gedit-0.9.7-cygwin/src/plugin.c	Sat Mar 16 16:27:37 2002
@@ -426,7 +426,11 @@ gedit_plugin_load_dir (char *dir)
 	
 	while ((e = readdir (d)) != NULL)
 	{
+#ifndef __CYGWIN__
 		if (strncmp (e->d_name + strlen (e->d_name) - 3, ".so", 3) == 0)
+#else
+		if (strncmp (e->d_name + strlen (e->d_name) - 4, ".dll", 4) == 0)
+#endif
 		{
 			char *plugin = g_strconcat (dir, e->d_name, NULL);
 			gedit_plugin_load (plugin);