--- a/xmlreaderimpl/bc.mak	Mon Jan 25 16:38:30 2016 +0000
+++ b/xmlreaderimpl/bc.mak	Tue Feb 02 21:49:24 2016 +0000
@@ -35,15 +35,15 @@
 
 
 
-LOCALINCLUDES=-Isupport\expat-2.0.1\lib -I$(INCLUDE_TOP)\stx\goodies\xmlsuite\core -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\xml\vw -I$(INCLUDE_TOP)\stx\goodies\xmlsuite\core -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
-LOCALLIBS=$(LIBEXPAT)
+LOCALLIBS=
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
-ALL:: $(LIBEXPAT) classLibRule
+ALL::  classLibRule
 
 classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
 
@@ -52,6 +52,7 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\xml\vw & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -62,21 +63,6 @@
 
 
 
-!ifdef USEMINGW64
-LIBEXPAT=support/expat-2.0.1/.libs/libexpat.a
-!else
-! ifdef USEMINGW32
-LIBEXPAT=support/expat-2.0.1/.libs/libexpat.a
-! else
-LIBEXPAT=support/expat-2.0.1/bcb5/release/libexpats_mtd.lib
-! endif
-!endif
-
-$(LIBEXPAT):
-	cd support/expat-2.0.1
-	$(MAKE_BAT)
-	cd ..\..\..
-
 
 
 
@@ -89,7 +75,8 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)XMLv2__ExpatXMLReader.$(O) XMLv2__ExpatXMLReader.$(H): XMLv2__ExpatXMLReader.st $(INCLUDE_TOP)\stx\goodies\xmlsuite\core\XMLv2__XMLReader.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)XMLv2__VWSAXBuilder.$(O) XMLv2__VWSAXBuilder.$(H): XMLv2__VWSAXBuilder.st $(INCLUDE_TOP)\stx\goodies\xml\vw\NodeBuilder.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\SAXBuilder.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\XMLNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)XMLv2__VWXMLReader.$(O) XMLv2__VWXMLReader.$(H): XMLv2__VWXMLReader.st $(INCLUDE_TOP)\stx\goodies\xml\vw\StreamWrapper.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\XMLParser.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\XMLParserStX.$(H) $(INCLUDE_TOP)\stx\goodies\xmlsuite\core\XMLv2__XMLReader.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)stx_goodies_xmlsuite_xmlreaderimpl.$(O) stx_goodies_xmlsuite_xmlreaderimpl.$(H): stx_goodies_xmlsuite_xmlreaderimpl.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line