Index: libxslt/win32config.h
===================================================================
RCS file: /cvs/gnome/libxslt/libxslt/win32config.h,v
retrieving revision 1.13
diff -u -r1.13 win32config.h
--- libxslt/win32config.h	6 Apr 2005 22:01:18 -0000	1.13
+++ libxslt/win32config.h	11 Sep 2005 23:09:06 -0000
@@ -77,10 +77,12 @@
 #endif /* _MSC_VER */
 
 #include <direct.h>
-#if defined(_MSC_VER) || defined(__MINGW32__)
+#if defined(_MSC_VER)
 #define mkdir(p,m) _mkdir(p)
 #define snprintf _snprintf
 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+#elif defined(__MINGW32__)
+#define mkdir(p,m) _mkdir(p)
 #endif
 
 #define HAVE_SYS_STAT_H
Index: win32/Makefile.mingw
===================================================================
RCS file: /cvs/gnome/libxslt/win32/Makefile.mingw,v
retrieving revision 1.7
diff -u -r1.7 Makefile.mingw
--- win32/Makefile.mingw	6 Apr 2005 22:01:57 -0000	1.7
+++ win32/Makefile.mingw	11 Sep 2005 23:08:11 -0000
@@ -72,6 +72,7 @@
 
 # Libxslt object files.
 XSLT_OBJS = $(XSLT_INTDIR)/attributes.o\
+	$(XSLT_INTDIR)/attrvt.o\
 	$(XSLT_INTDIR)/documents.o\
 	$(XSLT_INTDIR)/extensions.o\
 	$(XSLT_INTDIR)/extra.o\
@@ -92,6 +93,7 @@
 
 # Static libxslt object files.
 XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\
+	$(XSLT_INTDIR_A)/attrvt.o\
 	$(XSLT_INTDIR_A)/documents.o\
 	$(XSLT_INTDIR_A)/extensions.o\
 	$(XSLT_INTDIR_A)/extra.o\
@@ -231,7 +233,7 @@
 XSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION)
 XSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION)
 $(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) 
-	$(LD) $(XSLTSO_LDFLAGS) -o $(BINDIR)/$(XSLT_SO) $(XSLT_OBJS) $(LIBS) -llibxml2
+	$(LD) $(XSLTSO_LDFLAGS) -o $(BINDIR)/$(XSLT_SO) $(XSLT_OBJS) $(LIBS) -lxml2.dll
 
 # Creates the libxslt archive.
 $(BINDIR)\$(XSLT_A) : $(BINDIR) $(XSLT_OBJS_A)
@@ -266,7 +268,7 @@
 EXSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBEXSLT_MAJOR_VERSION)
 EXSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBEXSLT_MINOR_VERSION)
 $(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) libxslt
-	$(LD) $(EXSLTSO_LDFLAGS) -o $(BINDIR)/$(EXSLT_SO) $(EXSLT_OBJS) $(LIBS) -l$(XSLT_BASENAME) -llibxml2
+	$(LD) $(EXSLTSO_LDFLAGS) -o $(BINDIR)/$(EXSLT_SO) $(EXSLT_OBJS) $(LIBS) -l$(XSLT_BASENAME) -lxml2.dll
 
 # Creates the libexslt archive.
 $(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta
@@ -279,7 +281,7 @@
 
 # An implicit rule for xsltproc and friends.
 APPLIBS = $(LIBS)
-APPLIBS += -llibxml2 -l$(XSLT_BASENAME) -l$(EXSLT_BASENAME)
+APPLIBS += -lxml2.dll -l$(XSLT_BASENAME) -l$(EXSLT_BASENAME)
 APP_LDFLAGS = $(LDFLAGS)
 APP_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION)
 APP_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION)
@@ -288,11 +290,11 @@
 APP_LDFLAGS += -Bstatic
 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c
 	$(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $< 
-	$(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F))
+	$(LD) $(APP_LDFLAGS) -o $@ $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) $(APPLIBS) 
 else
 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c 
 	$(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $< 
-	$(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) 
+	$(LD) $(APP_LDFLAGS) -o $@ $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) $(APPLIBS) 
 endif
 
 # Builds xsltproc and friends. Uses the implicit rule for commands.
