--- a/bc.mak Tue Dec 14 21:15:32 1999 +0100
+++ b/bc.mak Wed Dec 15 20:39:56 1999 +0100
@@ -2,19 +2,23 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libtool/bc.mak,v 1.21 1999-12-10 13:20:23 cg Exp $
+# $Header: /cvs/stx/stx/libtool/bc.mak,v 1.22 1999-12-15 19:39:56 cg Exp $
#
TOP=..
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
+MODULE=stx
+MODULE_DIR=libtool
+PACKAGE=$(MODULE):$(MODULE_DIR)
LIBNAME=libtool
LIB_BASE=$(LIBTOOL_BASE)
-STCOPT="+optspace2 -warnNonStandard"
-STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
-#STCLOCALOPT="-package=stx:libtool +commonSymbols +optspace3 -varPrefix=libtool"
+STCOPT="-warnNonStandard"
+STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
+#STCLOCALOPT="-package=stx:libtool +commonSymbols +optspace3 +sepInitCode -varPrefix=libtool"
-ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
OBJS=\
$(OUTDIR)SystemBrowser.$(O) \
@@ -63,10 +67,10 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(STCHDR) ../include/AbstractLauncherApplication.$(H) ../include/ToolApplicationModel.$(H) ../include/ApplicationModel.$(H) ../include/Model.$(H) ../include/Object.$(H)
$(OUTDIR)OldLauncher.$(O) OldLauncher.$(H): OldLauncher.st $(STCHDR) ../include/StandardSystemView.$(H) ../include/TopView.$(H) ../include/View.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(STCHDR) ../include/InspectorView.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
-$(OUTDIR)ProcessMonitor.$(O) ProcessMonitor.$(H): ProcessMonitor.st $(STCHDR) SystemStatusMonitor.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
+$(OUTDIR)ProcessMonitor.$(O) ProcessMonitor.$(H): ProcessMonitor.st $(STCHDR)
$(OUTDIR)ProjectView.$(O) ProjectView.$(H): ProjectView.st $(STCHDR) ../include/StandardSystemView.$(H) ../include/TopView.$(H) ../include/View.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)RCSConflictEditTextView.$(O) RCSConflictEditTextView.$(H): RCSConflictEditTextView.st $(STCHDR) ../include/EditTextView.$(H) ../include/TextView.$(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)SemaphoreMonitor.$(O) SemaphoreMonitor.$(H): SemaphoreMonitor.st $(STCHDR) SystemStatusMonitor.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
+$(OUTDIR)SemaphoreMonitor.$(O) SemaphoreMonitor.$(H): SemaphoreMonitor.st $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(STCHDR) ../include/InspectorView.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)SystemBrowser.$(O) SystemBrowser.$(H): SystemBrowser.st $(STCHDR) ../include/ApplicationModel.$(H) ../include/Model.$(H) ../include/Object.$(H)
$(OUTDIR)SystemStatusMonitor.$(O) SystemStatusMonitor.$(H): SystemStatusMonitor.st $(STCHDR) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
--- a/nt.mak Tue Dec 14 21:15:32 1999 +0100
+++ b/nt.mak Wed Dec 15 20:39:56 1999 +0100
@@ -2,19 +2,23 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libtool/Attic/nt.mak,v 1.21 1999-12-10 13:20:23 cg Exp $
+# $Header: /cvs/stx/stx/libtool/Attic/nt.mak,v 1.22 1999-12-15 19:39:56 cg Exp $
#
TOP=..
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
+MODULE=stx
+MODULE_DIR=libtool
+PACKAGE=$(MODULE):$(MODULE_DIR)
LIBNAME=libtool
LIB_BASE=$(LIBTOOL_BASE)
-STCOPT="+optspace2 -warnNonStandard"
-STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
-#STCLOCALOPT="-package=stx:libtool +commonSymbols +optspace3 -varPrefix=libtool"
+STCOPT="-warnNonStandard"
+STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
+#STCLOCALOPT="-package=stx:libtool +commonSymbols +optspace3 +sepInitCode -varPrefix=libtool"
-ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
OBJS=\
$(OUTDIR)SystemBrowser.$(O) \
@@ -63,10 +67,10 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(STCHDR) ../include/AbstractLauncherApplication.$(H) ../include/ToolApplicationModel.$(H) ../include/ApplicationModel.$(H) ../include/Model.$(H) ../include/Object.$(H)
$(OUTDIR)OldLauncher.$(O) OldLauncher.$(H): OldLauncher.st $(STCHDR) ../include/StandardSystemView.$(H) ../include/TopView.$(H) ../include/View.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(STCHDR) ../include/InspectorView.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
-$(OUTDIR)ProcessMonitor.$(O) ProcessMonitor.$(H): ProcessMonitor.st $(STCHDR) SystemStatusMonitor.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
+$(OUTDIR)ProcessMonitor.$(O) ProcessMonitor.$(H): ProcessMonitor.st $(STCHDR)
$(OUTDIR)ProjectView.$(O) ProjectView.$(H): ProjectView.st $(STCHDR) ../include/StandardSystemView.$(H) ../include/TopView.$(H) ../include/View.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)RCSConflictEditTextView.$(O) RCSConflictEditTextView.$(H): RCSConflictEditTextView.st $(STCHDR) ../include/EditTextView.$(H) ../include/TextView.$(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)SemaphoreMonitor.$(O) SemaphoreMonitor.$(H): SemaphoreMonitor.st $(STCHDR) SystemStatusMonitor.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
+$(OUTDIR)SemaphoreMonitor.$(O) SemaphoreMonitor.$(H): SemaphoreMonitor.st $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(STCHDR) ../include/InspectorView.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)SystemBrowser.$(O) SystemBrowser.$(H): SystemBrowser.st $(STCHDR) ../include/ApplicationModel.$(H) ../include/Model.$(H) ../include/Object.$(H)
$(OUTDIR)SystemStatusMonitor.$(O) SystemStatusMonitor.$(H): SystemStatusMonitor.st $(STCHDR) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)