--- a/bc.mak	Tue Sep 14 08:40:10 1999 +0200
+++ b/bc.mak	Sat Sep 18 16:34:35 1999 +0200
@@ -5,12 +5,17 @@
 # $Header$
 #
 TOP=..
+#
 !INCLUDE $(TOP)\rules\stdHeader_nt
+#
 LIBNAME=libtool2
 LIB_BASE=$(LIBTOOL2_BASE)
 STCOPT="+optspace3 -warnNonStandard"
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
+#STCLOCALOPT="-package=stx:libtool2 +commonSymbols -varPrefix=libtool2"
+
 ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
 OBJS=\
   $(OUTDIR)ColorMenu.$(O) \
   $(OUTDIR)FontMenu.$(O) \
@@ -33,46 +38,30 @@
 !INCLUDE $(TOP)\rules\stdRules_nt
 
 
-$(OUTDIR)ColorMenu.$(O): ColorMenu.st
-$(OUTDIR)FontMenu.$(O): FontMenu.st
-$(OUTDIR)MenuEditor.$(O): MenuEditor.st
-$(OUTDIR)ImageEditor.$(O): ImageEditor.st
-$(OUTDIR)DataSetBuilder.$(O): DataSetBuilder.st
-$(OUTDIR)UIGalleryView.$(O): UIGalleryView.st
-$(OUTDIR)UIHelpTool.$(O): UIHelpTool.st
-$(OUTDIR)UILayoutTool.$(O): UILayoutTool.st
-$(OUTDIR)UIObjectView.$(O): UIObjectView.st
-$(OUTDIR)UIPainter.$(O): UIPainter.st
-$(OUTDIR)UIPainterView.$(O): UIPainterView.st
-$(OUTDIR)UISelectionPanel.$(O): UISelectionPanel.st
-$(OUTDIR)UISpecificationTool.$(O): UISpecificationTool.st
-$(OUTDIR)SelectionBrowser.$(O): SelectionBrowser.st
-$(OUTDIR)FileSelectionBrowser.$(O): FileSelectionBrowser.st
-$(OUTDIR)ResourceSelectionBrowser.$(O): ResourceSelectionBrowser.st
-
-
-$(OUTDIR)ColorMenu.$(O): ColorMenu.st $(STCHDR)  ../include/MenuPanel.$(H)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H)  ../include/SimpleDialog.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H) 
-$(OUTDIR)DataSetBuilder.$(O): DataSetBuilder.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H)  ../include/Array.$(H)  ../include/ArrColl.$(H)  ../include/SeqColl.$(H)  ../include/Coll.$(H) 
-$(OUTDIR)DirectoryView.$(O): DirectoryView.st $(STCHDR)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)FileSelectionBrowser.$(O): FileSelectionBrowser.st $(STCHDR)  ../include/SelectionBrowser.$(H)  ../include/SimpleDialog.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)FontMenu.$(O): FontMenu.st $(STCHDR)  ../include/MenuPanel.$(H)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H) 
-$(OUTDIR)HierarchicalListEditor.$(O): HierarchicalListEditor.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)ImageEditor.$(O): ImageEditor.st $(STCHDR)  ../include/ToolApplicationModel.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)InspectorList.$(O): InspectorList.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)InspectorListView.$(O): InspectorListView.st $(STCHDR)  ../include/SelListV.$(H)  ../include/ListView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H) 
-$(OUTDIR)InspectorPanelView.$(O): InspectorPanelView.st $(STCHDR)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H) 
-$(OUTDIR)InspectorView.$(O): InspectorView.st $(STCHDR)  ../include/VarVPanel.$(H)  ../include/VarPanel.$(H)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H) 
-$(OUTDIR)MenuEditor.$(O): MenuEditor.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H)   
-$(OUTDIR)MethodSelectionBrowser.$(O): MethodSelectionBrowser.st $(STCHDR)  ../include/ResourceSelectionBrowser.$(H)  ../include/SelectionBrowser.$(H)  ../include/SimpleDialog.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)ResourceSelectionBrowser.$(O): ResourceSelectionBrowser.st $(STCHDR)  ../include/SelectionBrowser.$(H)  ../include/SimpleDialog.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)SelectionBrowser.$(O): SelectionBrowser.st $(STCHDR)  ../include/SimpleDialog.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)ShellView.$(O): ShellView.st $(STCHDR)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)TabListEditor.$(O): TabListEditor.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UIGalleryView.$(O): UIGalleryView.st $(STCHDR)  ../include/NoteBookView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H)  ../include/DropObject.$(H) 
-$(OUTDIR)UIHelpTool.$(O): UIHelpTool.st $(STCHDR)  ../include/ToolApplicationModel.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UILayoutTool.$(O): UILayoutTool.st $(STCHDR)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UIObjectView.$(O): UIObjectView.st $(STCHDR)  ../include/ObjView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UIPainter.$(O): UIPainter.st $(STCHDR)  ../include/ToolApplicationModel.$(H)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H)   
-$(OUTDIR)UIPainterView.$(O): UIPainterView.st $(STCHDR)  ../include/UIObjectView.$(H)  ../include/ObjView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DSurface.$(H)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UISelectionPanel.$(O): UISelectionPanel.st $(STCHDR)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UISpecificationTool.$(O): UISpecificationTool.st $(STCHDR)  ../include/AppModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)ColorMenu.$(O) ColorMenu.$(H): ColorMenu.st $(STCHDR)  ../include/MenuPanel.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H)  ../include/SimpleDialog.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H) 
+$(OUTDIR)DataSetBuilder.$(O) DataSetBuilder.$(H): DataSetBuilder.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H)  ../include/Array.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H) 
+$(OUTDIR)DirectoryView.$(O) DirectoryView.$(H): DirectoryView.st $(STCHDR)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)FileSelectionBrowser.$(O) FileSelectionBrowser.$(H): FileSelectionBrowser.st $(STCHDR)  ../include/SelectionBrowser.$(H)  ../include/SimpleDialog.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)FontMenu.$(O) FontMenu.$(H): FontMenu.st $(STCHDR)  ../include/MenuPanel.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H) 
+$(OUTDIR)HierarchicalListEditor.$(O) HierarchicalListEditor.$(H): HierarchicalListEditor.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)ImageEditor.$(O) ImageEditor.$(H): ImageEditor.st $(STCHDR)  ../include/ToolApplicationModel.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)MenuEditor.$(O) MenuEditor.$(H): MenuEditor.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H)  ../include/SelectionInTreeView.$(H)  ../include/SelectionInListView.$(H)  ../include/ListView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H) 
+$(OUTDIR)MethodSelectionBrowser.$(O) MethodSelectionBrowser.$(H): MethodSelectionBrowser.st $(STCHDR)  ../include/ResourceSelectionBrowser.$(H)  ../include/SelectionBrowser.$(H)  ../include/SimpleDialog.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)NewInspectorList.$(O) NewInspectorList.$(H): NewInspectorList.st $(STCHDR)  ../include/Object.$(H) 
+$(OUTDIR)NewInspectorListView.$(O) NewInspectorListView.$(H): NewInspectorListView.st $(STCHDR)  ../include/SelectionInListView.$(H)  ../include/ListView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H) 
+$(OUTDIR)NewInspectorPanelView.$(O) NewInspectorPanelView.$(H): NewInspectorPanelView.st $(STCHDR)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H) 
+$(OUTDIR)NewInspectorView.$(O) NewInspectorView.$(H): NewInspectorView.st $(STCHDR)  ../include/VariableVerticalPanel.$(H)  ../include/VariablePanel.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H) 
+$(OUTDIR)ResourceSelectionBrowser.$(O) ResourceSelectionBrowser.$(H): ResourceSelectionBrowser.st $(STCHDR)  ../include/SelectionBrowser.$(H)  ../include/SimpleDialog.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)SelectionBrowser.$(O) SelectionBrowser.$(H): SelectionBrowser.st $(STCHDR)  ../include/SimpleDialog.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)ShellView.$(O) ShellView.$(H): ShellView.st $(STCHDR)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)TabListEditor.$(O) TabListEditor.$(H): TabListEditor.st $(STCHDR)  ../include/ResourceSpecEditor.$(H)  ../include/ToolApplicationModel.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)UIGalleryView.$(O) UIGalleryView.$(H): UIGalleryView.st $(STCHDR)  ../include/NoteBookView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H)  ../include/DropObject.$(H) 
+$(OUTDIR)UIHelpTool.$(O) UIHelpTool.$(H): UIHelpTool.st $(STCHDR)  ../include/ToolApplicationModel.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)UILayoutTool.$(O) UILayoutTool.$(H): UILayoutTool.st $(STCHDR)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)UIObjectView.$(O) UIObjectView.$(H): UIObjectView.st $(STCHDR)  ../include/ObjectView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H) 
+$(OUTDIR)UIPainter.$(O) UIPainter.$(H): UIPainter.st $(STCHDR)  ../include/ToolApplicationModel.$(H)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H)  ../include/SelectionInTreeView.$(H)  ../include/SelectionInListView.$(H)  ../include/ListView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H) 
+$(OUTDIR)UIPainterView.$(O) UIPainterView.$(H): UIPainterView.st $(STCHDR)  ../include/UIObjectView.$(H)  ../include/ObjectView.$(H)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H) 
+$(OUTDIR)UISelectionPanel.$(O) UISelectionPanel.$(H): UISelectionPanel.st $(STCHDR)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)UISpecificationTool.$(O) UISpecificationTool.$(H): UISpecificationTool.st $(STCHDR)  ../include/ApplicationModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+# ENDMAKEDEPEND --- do not remove this line