--- a/xmlreaderimpl/Make.proto	Mon Jan 25 16:38:30 2016 +0000
+++ b/xmlreaderimpl/Make.proto	Tue Feb 02 21:49:24 2016 +0000
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-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
 
 
 # if you need any additional defines for embedded C code,
@@ -49,7 +49,7 @@
 
 # ********** OPTIONAL: MODIFY the next line ***
 # additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=support/expat-2.0.1/build/lib/libexpat.a
+LD_OBJ_LIBS=
 LOCAL_SHARED_LIBS=
 
 
@@ -63,13 +63,8 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs:: support/expat-2.0.1/build/lib/libexpat.a 
-
+pre_objs::  
 
-support/expat-2.0.1/build/lib/libexpat.a:
-	mkdir support/expat-2.0.1/build && cd support/expat-2.0.1/build && CFLAGS=-m32 ../configure --prefix=$$PWD
-	$(MAKE) -C support/expat-2.0.1/build
-	$(MAKE) -C support/expat-2.0.1/build install
 
 
 
@@ -90,7 +85,7 @@
 		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_goodies_xmlsuite_xmlreaderimpl.svn.st; \
 	fi
 	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_goodies_xmlsuite_xmlreaderimpl.svn $(C_RULE);
-	sed -i -e "s/\".stx_goodies_xmlsuite_xmlreaderimpl.svn.st\");/\"\stx_goodies_xmlsuite_xmlreaderimpl.st\");/g" .stx_goodies_xmlsuite_xmlreaderimpl.svn.c
+	sed -i -e "s/\".stx_goodies_xmlsuite_xmlreaderimpl.svn.st\");/\"stx_goodies_xmlsuite_xmlreaderimpl.st\");/g" .stx_goodies_xmlsuite_xmlreaderimpl.svn.c
 	$(MAKE) .stx_goodies_xmlsuite_xmlreaderimpl.svn.$(O)
 	@mv .stx_goodies_xmlsuite_xmlreaderimpl.svn.$(O) stx_goodies_xmlsuite_xmlreaderimpl.$(O)
 endif
@@ -129,6 +124,7 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -154,7 +150,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