--- a/Make.proto Fri Nov 21 16:04:41 2003 +0100
+++ b/Make.proto Fri Nov 21 20:24:13 2003 +0100
@@ -1,18 +1,8 @@
-# $Header: /cvs/stx/stx/libbasic3/Make.proto,v 1.54 2003-11-18 14:06:26 cg Exp $
+# $Header: /cvs/stx/stx/libbasic3/Make.proto,v 1.55 2003-11-21 19:24:13 cg Exp $
#
# -------------- no need to change anything below ----------
TOP=..
-SUBDIRS=
-
-MODULE=stx
-MODULE_DIR=libbasic3
-LIBNAME=libbasic3
-THIS_IS_A_BASE_LIBRARY="yes"
-
-PACKAGE=$(MODULE):$(LIBNAME)
-LIB_BASE=$(LIBBASIC3_BASE)
-NM_LIB_BASE=LIBBASIC3_BASE
STCOPT=$(LIBBASIC3_STCOPT)
STCLOCALOPT='-package=$(PACKAGE)' $(COMMONSYMBOLS) $(SEPINITCODE) $(LINKILC) -varPrefix=$(LIBNAME)
@@ -20,74 +10,6 @@
all:: classLibRule
-#
-# these are uncritical - save some bytes by compiling with optspace
-#
-UNCRITICALOBJS= \
- $(OUTDIR)Change.$(O) \
- $(OUTDIR)ClassChange.$(O) \
- $(OUTDIR)ClassCommentChange.$(O) \
- $(OUTDIR)ClassDefinitionChange.$(O) \
- $(OUTDIR)ClassPrimitiveChange.$(O) \
- $(OUTDIR)ClassInstVarDefinitionChange.$(O) \
- $(OUTDIR)ClassOtherChange.$(O) \
- $(OUTDIR)ClassPrimitiveDefinitionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveFunctionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveVariablesChange.$(O) \
- $(OUTDIR)ClassRemoveChange.$(O) \
- $(OUTDIR)ClassRenameChange.$(O) \
- $(OUTDIR)MethodChange.$(O) \
- $(OUTDIR)MethodCategoryChange.$(O) \
- $(OUTDIR)MethodCategoryRenameChange.$(O) \
- $(OUTDIR)MethodDefinitionChange.$(O) \
- $(OUTDIR)MethodPrivacyChange.$(O) \
- $(OUTDIR)MethodRemoveChange.$(O) \
- $(OUTDIR)NameSpaceCreationChange.$(O) \
- $(OUTDIR)DoItChange.$(O) \
- $(OUTDIR)OtherChange.$(O) \
- $(OUTDIR)ChangeSet.$(O) \
- $(OUTDIR)HistoryManager.$(O) \
- $(OUTDIR)AbstractSourceCodeManager.$(O) \
- $(OUTDIR)CVSSourceCodeManager.$(O) \
- $(OUTDIR)SourceCodeManagerUtilities.$(O) \
- $(OUTDIR)HTMLDocGenerator.$(O) \
-
-
-OBJS= \
- $(OUTDIR)Change.$(O) \
- $(OUTDIR)ClassChange.$(O) \
- $(OUTDIR)ClassCommentChange.$(O) \
- $(OUTDIR)ClassDefinitionChange.$(O) \
- $(OUTDIR)ClassPrimitiveChange.$(O) \
- $(OUTDIR)ClassInstVarDefinitionChange.$(O) \
- $(OUTDIR)ClassOtherChange.$(O) \
- $(OUTDIR)ClassPrimitiveDefinitionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveFunctionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveVariablesChange.$(O) \
- $(OUTDIR)ClassRemoveChange.$(O) \
- $(OUTDIR)ClassRenameChange.$(O) \
- $(OUTDIR)MethodChange.$(O) \
- $(OUTDIR)MethodCategoryChange.$(O) \
- $(OUTDIR)MethodCategoryRenameChange.$(O) \
- $(OUTDIR)MethodDefinitionChange.$(O) \
- $(OUTDIR)MethodPrivacyChange.$(O) \
- $(OUTDIR)MethodRemoveChange.$(O) \
- $(OUTDIR)NameSpaceCreationChange.$(O) \
- $(OUTDIR)DoItChange.$(O) \
- $(OUTDIR)OtherChange.$(O) \
- $(OUTDIR)ChangeSet.$(O) \
- $(OUTDIR)HistoryManager.$(O) \
- $(OUTDIR)MessageTally.$(O) \
- $(OUTDIR)CallChain.$(O) \
- $(OUTDIR)ProfileTree.$(O) \
- $(OUTDIR)MessageTracer.$(O) \
- $(OUTDIR)WrappedMethod.$(O) \
- $(OUTDIR)AbstractSourceCodeManager.$(O) \
- $(OUTDIR)CVSSourceCodeManager.$(O) \
- $(OUTDIR)SourceCodeManagerUtilities.$(O) \
- $(OUTDIR)HTMLDocGenerator.$(O) \
-
-
objs:: $(OBJS)
cleanjunk::
--- a/bc.mak Fri Nov 21 16:04:41 2003 +0100
+++ b/bc.mak Fri Nov 21 20:24:13 2003 +0100
@@ -2,14 +2,14 @@
# DO NOT EDIT
# automagically generated from Make.proto (by make nt.mak)
#
+
TOP=..
+
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
-MODULE=stx
-MODULE_DIR=libbasic3
-PACKAGE=$(MODULE):$(MODULE_DIR)
-LIBNAME=libbasic3
+!INCLUDE Make.spec
+#
LIB_BASE_LD_ARG=$(LIBBASIC3_BASE_LD_ARG)
STCOPT="+optspace2 -warnNonStandard"
STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
@@ -17,51 +17,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-#
-# additional defines
-#
-
-OBJS=\
- $(OUTDIR)Change.$(O) \
- $(OUTDIR)ClassChange.$(O) \
- $(OUTDIR)ClassCommentChange.$(O) \
- $(OUTDIR)ClassDefinitionChange.$(O) \
- $(OUTDIR)ClassPrimitiveChange.$(O) \
- $(OUTDIR)ClassInstVarDefinitionChange.$(O) \
- $(OUTDIR)ClassOtherChange.$(O) \
- $(OUTDIR)ClassPrimitiveDefinitionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveFunctionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveVariablesChange.$(O) \
- $(OUTDIR)ClassRemoveChange.$(O) \
- $(OUTDIR)ClassRenameChange.$(O) \
- $(OUTDIR)MethodChange.$(O) \
- $(OUTDIR)MethodCategoryChange.$(O) \
- $(OUTDIR)MethodCategoryRenameChange.$(O) \
- $(OUTDIR)MethodDefinitionChange.$(O) \
- $(OUTDIR)MethodPrivacyChange.$(O) \
- $(OUTDIR)MethodRemoveChange.$(O) \
- $(OUTDIR)NameSpaceCreationChange.$(O) \
- $(OUTDIR)DoItChange.$(O) \
- $(OUTDIR)OtherChange.$(O) \
- $(OUTDIR)ChangeSet.$(O) \
- $(OUTDIR)HistoryManager.$(O) \
- $(OUTDIR)MessageTally.$(O) \
- $(OUTDIR)CallChain.$(O) \
- $(OUTDIR)ProfileTree.$(O) \
- $(OUTDIR)MessageTracer.$(O) \
- $(OUTDIR)WrappedMethod.$(O) \
- $(OUTDIR)AbstractSourceCodeManager.$(O) \
- $(OUTDIR)CVSSourceCodeManager.$(O) \
- $(OUTDIR)SourceCodeManagerUtilities.$(O) \
- $(OUTDIR)HTMLDocGenerator.$(O) \
-
-
!INCLUDE $(TOP)\rules\stdRules_nt
-#
-# additional rules
-#
-
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)AbstractPackage.$(O) AbstractPackage.$(H): AbstractPackage.st $(STCHDR) ../include/Object.$(H)
$(OUTDIR)AbstractPackageBrowser.$(O) AbstractPackageBrowser.$(H): AbstractPackageBrowser.st $(STCHDR) ../include/ApplicationModel.$(H) ../include/Model.$(H) ../include/Object.$(H)
--- a/nt.mak Fri Nov 21 16:04:41 2003 +0100
+++ b/nt.mak Fri Nov 21 20:24:13 2003 +0100
@@ -2,14 +2,14 @@
# DO NOT EDIT
# automagically generated from Make.proto (by make nt.mak)
#
+
TOP=..
+
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
-MODULE=stx
-MODULE_DIR=libbasic3
-PACKAGE=$(MODULE):$(MODULE_DIR)
-LIBNAME=libbasic3
+!INCLUDE Make.spec
+#
LIB_BASE_LD_ARG=$(LIBBASIC3_BASE_LD_ARG)
STCOPT="+optspace2 -warnNonStandard"
STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
@@ -17,51 +17,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-#
-# additional defines
-#
-
-OBJS=\
- $(OUTDIR)Change.$(O) \
- $(OUTDIR)ClassChange.$(O) \
- $(OUTDIR)ClassCommentChange.$(O) \
- $(OUTDIR)ClassDefinitionChange.$(O) \
- $(OUTDIR)ClassPrimitiveChange.$(O) \
- $(OUTDIR)ClassInstVarDefinitionChange.$(O) \
- $(OUTDIR)ClassOtherChange.$(O) \
- $(OUTDIR)ClassPrimitiveDefinitionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveFunctionsChange.$(O) \
- $(OUTDIR)ClassPrimitiveVariablesChange.$(O) \
- $(OUTDIR)ClassRemoveChange.$(O) \
- $(OUTDIR)ClassRenameChange.$(O) \
- $(OUTDIR)MethodChange.$(O) \
- $(OUTDIR)MethodCategoryChange.$(O) \
- $(OUTDIR)MethodCategoryRenameChange.$(O) \
- $(OUTDIR)MethodDefinitionChange.$(O) \
- $(OUTDIR)MethodPrivacyChange.$(O) \
- $(OUTDIR)MethodRemoveChange.$(O) \
- $(OUTDIR)NameSpaceCreationChange.$(O) \
- $(OUTDIR)DoItChange.$(O) \
- $(OUTDIR)OtherChange.$(O) \
- $(OUTDIR)ChangeSet.$(O) \
- $(OUTDIR)HistoryManager.$(O) \
- $(OUTDIR)MessageTally.$(O) \
- $(OUTDIR)CallChain.$(O) \
- $(OUTDIR)ProfileTree.$(O) \
- $(OUTDIR)MessageTracer.$(O) \
- $(OUTDIR)WrappedMethod.$(O) \
- $(OUTDIR)AbstractSourceCodeManager.$(O) \
- $(OUTDIR)CVSSourceCodeManager.$(O) \
- $(OUTDIR)SourceCodeManagerUtilities.$(O) \
- $(OUTDIR)HTMLDocGenerator.$(O) \
-
-
!INCLUDE $(TOP)\rules\stdRules_nt
-#
-# additional rules
-#
-
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)AbstractPackage.$(O) AbstractPackage.$(H): AbstractPackage.st $(STCHDR) ../include/Object.$(H)
$(OUTDIR)AbstractPackageBrowser.$(O) AbstractPackageBrowser.$(H): AbstractPackageBrowser.st $(STCHDR) ../include/ApplicationModel.$(H) ../include/Model.$(H) ../include/Object.$(H)