--- a/bc.mak Fri Sep 03 11:49:54 1999 +0200
+++ b/bc.mak Fri Sep 03 11:55:49 1999 +0200
@@ -2,16 +2,14 @@
# DO NOT EDIT
# automatically generated from Make.proto
#
-# $Header: /cvs/stx/stx/libcomp/bc.mak,v 1.16 1999-05-18 12:12:07 cg Exp $
+# $Header: /cvs/stx/stx/libcomp/bc.mak,v 1.17 1999-09-03 09:55:49 cg Exp $
#
TOP=..
!INCLUDE $(TOP)\rules\stdHeader_nt
LIBNAME=libcomp
-RESFILES=$(OUTDIR)$(LIBNAME).res
-PACKAGE=stx:$(LIBNAME)
LIB_BASE=$(LIBCOMP_BASE)
STCOPT="+optinline -warnNonStandard"
-STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) -varPrefix=$(LIBNAME)
+STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
OBJS=\
$(OUTDIR)Scanner.$(O) \
@@ -49,9 +47,9 @@
$(OUTDIR)Scanner.$(O): Scanner.st
-$(OUTDIR)Parser.$(O): Parser.st $(INCLUDE)\Scanner.STH
-$(OUTDIR)BCompiler.$(O): BCompiler.st $(INCLUDE)\Scanner.STH $(INCLUDE)\Parser.STH
-$(OUTDIR)Explainer.$(O): Explainer.st $(INCLUDE)\Scanner.STH $(INCLUDE)\Parser.STH
+$(OUTDIR)Parser.$(O): Parser.st
+$(OUTDIR)BCompiler.$(O): BCompiler.st
+$(OUTDIR)Explainer.$(O): Explainer.st
$(OUTDIR)ProgramNodeEnumerator.$(O): ProgramNodeEnumerator.st
$(OUTDIR)Variable.$(O): Variable.st
$(OUTDIR)ParseNode.$(O): ParseNode.st
@@ -75,5 +73,46 @@
$(OUTDIR)ImmArray.$(O): ImmArray.st
$(OUTDIR)ObjFHandle.$(O): ObjFHandle.st
$(OUTDIR)Structure.$(O): Structure.st
-$(OUTDIR)SyntaxHighlighter.$(O): SyntaxHighlighter.st $(INCLUDE)\Scanner.STH $(INCLUDE)\Parser.STH
+$(OUTDIR)SyntaxHighlighter.$(O): SyntaxHighlighter.st
$(OUTDIR)ObjFLoader.$(O): ObjFLoader.st
+
+
+$(OUTDIR)AssignNd.$(O): AssignNd.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)BCompiler.$(O): BCompiler.st $(STCHDR) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)BinaryNd.$(O): BinaryNd.st $(STCHDR) ../include/MessageNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)BlockNode.$(O): BlockNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)CascadeNd.$(O): CascadeNd.st $(STCHDR) ../include/MessageNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)CodeStream.$(O): CodeStream.st $(STCHDR) ../include/WriteStr.$(H) ../include/PosStream.$(H) ../include/PeekStr.$(H) ../include/Stream.$(H) ../include/Object.$(H)
+$(OUTDIR)CompErr.$(O): CompErr.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ConstNode.$(O): ConstNode.st $(STCHDR) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Decomp.$(O): Decomp.st $(STCHDR) ../include/BCompiler.$(H) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)Explainer.$(O): Explainer.st $(STCHDR) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)ImmArray.$(O): ImmArray.st $(STCHDR) ../include/Array.$(H) ../include/ArrColl.$(H) ../include/SeqColl.$(H) ../include/Coll.$(H) ../include/Object.$(H)
+$(OUTDIR)ImmutableString.$(O): ImmutableString.st $(STCHDR) ../include/String.$(H) ../include/CharArray.$(H) ../include/ByteArray.$(H) ../include/UIBytes.$(H) ../include/ArrColl.$(H) ../include/SeqColl.$(H) ../include/Coll.$(H) ../include/Object.$(H)
+$(OUTDIR)LazyMethod.$(O): LazyMethod.st $(STCHDR) ../include/Method.$(H) ../include/CompCode.$(H) ../include/ExecFunc.$(H) ../include/Object.$(H)
+$(OUTDIR)MessageNd.$(O): MessageNd.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)MethodNode.$(O): MethodNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)NullScope.$(O): NullScope.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ObjFHandle.$(O): ObjFHandle.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ObjFLoader.$(O): ObjFLoader.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ParameterNode.$(O): ParameterNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)ParseNode.$(O): ParseNode.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)Parser.$(O): Parser.st $(STCHDR) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)PrimNd.$(O): PrimNd.st $(STCHDR) ../include/StatNode.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)PrimaryNd.$(O): PrimaryNd.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)ProgNodeBldr.$(O): ProgNodeBldr.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ProgramNodeEnumerator.$(O): ProgramNodeEnumerator.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)RetNode.$(O): RetNode.st $(STCHDR) ../include/StatNode.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Scanner.$(O): Scanner.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)SelfNode.$(O): SelfNode.st $(STCHDR) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)SrcFLoader.$(O): SrcFLoader.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)StatNode.$(O): StatNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Structure.$(O): Structure.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)SuperNode.$(O): SuperNode.st $(STCHDR) ../include/SelfNode.$(H) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Switch.$(O): Switch.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)SyntaxHighlighter.$(O): SyntaxHighlighter.st $(STCHDR) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)UnaryNd.$(O): UnaryNd.st $(STCHDR) ../include/MessageNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)UndefVar.$(O): UndefVar.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)VarNode.$(O): VarNode.st $(STCHDR) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Variable.$(O): Variable.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)WarningCompilationErrorHandler.$(O): WarningCompilationErrorHandler.st $(STCHDR)
--- a/nt.mak Fri Sep 03 11:49:54 1999 +0200
+++ b/nt.mak Fri Sep 03 11:55:49 1999 +0200
@@ -2,16 +2,14 @@
# DO NOT EDIT
# automatically generated from Make.proto
#
-# $Header: /cvs/stx/stx/libcomp/Attic/nt.mak,v 1.16 1999-05-18 12:12:07 cg Exp $
+# $Header: /cvs/stx/stx/libcomp/Attic/nt.mak,v 1.17 1999-09-03 09:55:49 cg Exp $
#
TOP=..
!INCLUDE $(TOP)\rules\stdHeader_nt
LIBNAME=libcomp
-RESFILES=$(OUTDIR)$(LIBNAME).res
-PACKAGE=stx:$(LIBNAME)
LIB_BASE=$(LIBCOMP_BASE)
STCOPT="+optinline -warnNonStandard"
-STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) -varPrefix=$(LIBNAME)
+STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
OBJS=\
$(OUTDIR)Scanner.$(O) \
@@ -49,9 +47,9 @@
$(OUTDIR)Scanner.$(O): Scanner.st
-$(OUTDIR)Parser.$(O): Parser.st $(INCLUDE)\Scanner.STH
-$(OUTDIR)BCompiler.$(O): BCompiler.st $(INCLUDE)\Scanner.STH $(INCLUDE)\Parser.STH
-$(OUTDIR)Explainer.$(O): Explainer.st $(INCLUDE)\Scanner.STH $(INCLUDE)\Parser.STH
+$(OUTDIR)Parser.$(O): Parser.st
+$(OUTDIR)BCompiler.$(O): BCompiler.st
+$(OUTDIR)Explainer.$(O): Explainer.st
$(OUTDIR)ProgramNodeEnumerator.$(O): ProgramNodeEnumerator.st
$(OUTDIR)Variable.$(O): Variable.st
$(OUTDIR)ParseNode.$(O): ParseNode.st
@@ -75,5 +73,46 @@
$(OUTDIR)ImmArray.$(O): ImmArray.st
$(OUTDIR)ObjFHandle.$(O): ObjFHandle.st
$(OUTDIR)Structure.$(O): Structure.st
-$(OUTDIR)SyntaxHighlighter.$(O): SyntaxHighlighter.st $(INCLUDE)\Scanner.STH $(INCLUDE)\Parser.STH
+$(OUTDIR)SyntaxHighlighter.$(O): SyntaxHighlighter.st
$(OUTDIR)ObjFLoader.$(O): ObjFLoader.st
+
+
+$(OUTDIR)AssignNd.$(O): AssignNd.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)BCompiler.$(O): BCompiler.st $(STCHDR) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)BinaryNd.$(O): BinaryNd.st $(STCHDR) ../include/MessageNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)BlockNode.$(O): BlockNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)CascadeNd.$(O): CascadeNd.st $(STCHDR) ../include/MessageNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)CodeStream.$(O): CodeStream.st $(STCHDR) ../include/WriteStr.$(H) ../include/PosStream.$(H) ../include/PeekStr.$(H) ../include/Stream.$(H) ../include/Object.$(H)
+$(OUTDIR)CompErr.$(O): CompErr.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ConstNode.$(O): ConstNode.st $(STCHDR) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Decomp.$(O): Decomp.st $(STCHDR) ../include/BCompiler.$(H) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)Explainer.$(O): Explainer.st $(STCHDR) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)ImmArray.$(O): ImmArray.st $(STCHDR) ../include/Array.$(H) ../include/ArrColl.$(H) ../include/SeqColl.$(H) ../include/Coll.$(H) ../include/Object.$(H)
+$(OUTDIR)ImmutableString.$(O): ImmutableString.st $(STCHDR) ../include/String.$(H) ../include/CharArray.$(H) ../include/ByteArray.$(H) ../include/UIBytes.$(H) ../include/ArrColl.$(H) ../include/SeqColl.$(H) ../include/Coll.$(H) ../include/Object.$(H)
+$(OUTDIR)LazyMethod.$(O): LazyMethod.st $(STCHDR) ../include/Method.$(H) ../include/CompCode.$(H) ../include/ExecFunc.$(H) ../include/Object.$(H)
+$(OUTDIR)MessageNd.$(O): MessageNd.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)MethodNode.$(O): MethodNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)NullScope.$(O): NullScope.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ObjFHandle.$(O): ObjFHandle.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ObjFLoader.$(O): ObjFLoader.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ParameterNode.$(O): ParameterNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)ParseNode.$(O): ParseNode.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)Parser.$(O): Parser.st $(STCHDR) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)PrimNd.$(O): PrimNd.st $(STCHDR) ../include/StatNode.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)PrimaryNd.$(O): PrimaryNd.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)ProgNodeBldr.$(O): ProgNodeBldr.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)ProgramNodeEnumerator.$(O): ProgramNodeEnumerator.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)RetNode.$(O): RetNode.st $(STCHDR) ../include/StatNode.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Scanner.$(O): Scanner.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)SelfNode.$(O): SelfNode.st $(STCHDR) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)SrcFLoader.$(O): SrcFLoader.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)StatNode.$(O): StatNode.st $(STCHDR) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Structure.$(O): Structure.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)SuperNode.$(O): SuperNode.st $(STCHDR) ../include/SelfNode.$(H) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Switch.$(O): Switch.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)SyntaxHighlighter.$(O): SyntaxHighlighter.st $(STCHDR) ../include/Parser.$(H) ../include/Scanner.$(H) ../include/Object.$(H)
+$(OUTDIR)UnaryNd.$(O): UnaryNd.st $(STCHDR) ../include/MessageNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)UndefVar.$(O): UndefVar.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)VarNode.$(O): VarNode.st $(STCHDR) ../include/PrimaryNd.$(H) ../include/ParseNode.$(H) ../include/Object.$(H)
+$(OUTDIR)Variable.$(O): Variable.st $(STCHDR) ../include/Object.$(H)
+$(OUTDIR)WarningCompilationErrorHandler.$(O): WarningCompilationErrorHandler.st $(STCHDR)