diff --git a/expat/Makefile.in b/expat/Makefile.in
index ce0a987c..44cef125 100644
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -76,13 +76,15 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-SUBDIRS = lib
+SUBDIRS = lib examples sample xmlwf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_HEADERS = config.h:config.hin
 
 DISTDIR = $(PACKAGE)-$(VERSION)
 DISTRIBUTION = $(DISTDIR).tar.gz
 
+buildlib: lib
+
 all: $(SUBDIRS)
 
 .PHONY: all $(SUBDIRS) clean distclean maintainer-clean dist install \
@@ -119,7 +121,7 @@ distclean:
 	@list='$(SUBDIRS)'; for dir in $$list; do \
 	  cd $$dir; $(MAKE) distclean; cd ..; \
 	done
-	rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile
+	rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile sample/Makefile
 
 maintainer-clean: distclean
 	rm -f $(DISTRIBUTION)
diff --git a/expat/examples/Makefile.in b/expat/examples/Makefile.in
index 2d184a14..f3736a45 100644
--- a/expat/examples/Makefile.in
+++ b/expat/examples/Makefile.in
@@ -18,12 +18,23 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
 #
 
+LIBDIR = ../lib/.libs
+INCDIR = ../lib
+
 CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = -lexpat
-CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@ -static
+LIBS = -L$(LIBDIR) -lexpat 
+CFLAGS = @CFLAGS@ -I$(INCDIR)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
 
 all: outline
 
 outline: outline.o
-	$(CC) -o outline outline.o $(LDFLAGS) $(LIBS)@
+	$(CC) -o outline outline.o $(LDFLAGS) $(LIBS)
+
+clean:
+	rm -f outline core *.o
diff --git a/expat/xmlwf/Makefile.in b/expat/xmlwf/Makefile.in
index c17ea289..00850ae2 100644
--- a/expat/xmlwf/Makefile.in
+++ b/expat/xmlwf/Makefile.in
@@ -1,15 +1,40 @@
+################################################################
+# Process this file with top-level configure script to produce Makefile
+#
+# Copyright 2000 Clark Cooper
+#
+#  This file is part of EXPAT.
+#
+#  EXPAT is free software; you can redistribute it and/or modify it
+#  under the terms of the License (based on the MIT/X license) contained
+#  in the file COPYING that comes with this distribution.
+#
+# EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
+#
+
 LIBDIR= ../lib/.libs
 INCDIR= ../lib
 
-LDFLAGS= @LDFLAGS@
+LDFLAGS= @LDFLAGS@ -static
 CFLAGS= @CFLAGS@ -I$(INCDIR)
 
 FILEMAP_OBJ= @FILEMAP_OBJ@
 OBJS= xmlwf.o xmlfile.o codepage.o $(FILEMAP_OBJ)
 LIBS= -L$(LIBDIR) -lexpat
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+
 xmlwf: $(OBJS)
 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
 
 clean:
-	rm -f xmlwf core *.o@
+	rm -f xmlwf core *.o