--- a/Make.proto	Mon Mar 29 11:48:57 2010 +0000
+++ b/Make.proto	Sun Apr 11 11:38:55 2010 +0000
@@ -1,6 +1,6 @@
 # $Header$
 #
-# DO NOT EDIT 
+# DO NOT EDIT
 # automagically generated from the projectDefinition: stx_goodies_smaCC.
 #
 # Warning: once you modify this file, do not rerun
@@ -30,15 +30,15 @@
 
 REQUIRED_SUPPORT_DIRS=
 
-# if your embedded C code requires any system includes, 
-# add the path(es) here:, 
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/changes -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers
 
 
-# if you need any additional defines for embedded C code, 
-# add them here:, 
+# if you need any additional defines for embedded C code,
+# add them here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
 LOCALDEFINES=
@@ -63,8 +63,14 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs:: 
+pre_objs::  update-svn-revision
+
+
 
+update-svn-revision:
+	sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+		stx_goodies_smaCC.st
+.PHONY: update-svn-revision
 
 
 # add more install actions here
@@ -80,23 +86,26 @@
 postMake:: cleanjunk
 
 prereq: $(REQUIRED_SUPPORT_DIRS)
-	cd ../../libbasic && $(MAKE)
-	cd ../refactoryBrowser/helpers && $(MAKE)
-	cd ../refactoryBrowser/parser && $(MAKE)
-	cd ../../libbasic2 && $(MAKE)
-	cd ../../libcomp && $(MAKE)
-	cd ../../libview && $(MAKE)
-	cd ../../libbasic3 && $(MAKE)
-	cd ../../libview2 && $(MAKE)
-	cd ../refactoryBrowser/changes && $(MAKE)
-	cd ../../libui && $(MAKE)
-	cd ../../libwidg && $(MAKE)
-	cd ../../libwidg3 && $(MAKE)
-	cd ../../libhtml && $(MAKE)
-	cd ../../libwidg2 && $(MAKE)
-	cd ../../libtool && $(MAKE)
-	cd ../sunit && $(MAKE)
-	cd ../../librun && $(MAKE)
+	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../refactoryBrowser/helpers && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../refactoryBrowser/changes && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../xml/stx && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
@@ -110,6 +119,7 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)SmaCC__LineNumberStreamTest.$(O) SmaCC__LineNumberStreamTest.$(H): SmaCC__LineNumberStreamTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SmaCC__SmaCCAction.$(O) SmaCC__SmaCCAction.$(H): SmaCC__SmaCCAction.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SmaCC__SmaCCCompilationNotification.$(O) SmaCC__SmaCCCompilationNotification.$(H): SmaCC__SmaCCCompilationNotification.st $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SmaCC__SmaCCEdge.$(O) SmaCC__SmaCCEdge.$(H): SmaCC__SmaCCEdge.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -130,6 +140,7 @@
 $(OUTDIR)SmaCC__SmaCCSymbolSet.$(O) SmaCC__SmaCCSymbolSet.$(H): SmaCC__SmaCCSymbolSet.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SmaCC__SmaCCToken.$(O) SmaCC__SmaCCToken.$(H): SmaCC__SmaCCToken.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)stx_goodies_smaCC.$(O) stx_goodies_smaCC.$(H): stx_goodies_smaCC.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmaCC__ParserGeneratorTest.$(O) SmaCC__ParserGeneratorTest.$(H): SmaCC__ParserGeneratorTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/goodies/smaCC/SmaCC__SmaCCParser.$(H) $(INCLUDE_TOP)/stx/goodies/smaCC/SmaCC__SmaCCScanner.$(H) $(STCHDR)
 $(OUTDIR)SmaCC__SmaCCAcceptAction.$(O) SmaCC__SmaCCAcceptAction.$(H): SmaCC__SmaCCAcceptAction.st $(INCLUDE_TOP)/stx/goodies/smaCC/SmaCC__SmaCCAction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SmaCC__SmaCCAdvancedParser.$(O) SmaCC__SmaCCAdvancedParser.$(H): SmaCC__SmaCCAdvancedParser.st $(INCLUDE_TOP)/stx/goodies/smaCC/SmaCC__SmaCCParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SmaCC__SmaCCAdvancedScanner.$(O) SmaCC__SmaCCAdvancedScanner.$(H): SmaCC__SmaCCAdvancedScanner.st $(INCLUDE_TOP)/stx/goodies/smaCC/SmaCC__SmaCCScanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)