--- a/bc.mak	Sat Sep 11 12:29:56 1999 +0200
+++ b/bc.mak	Sat Sep 11 12:34:33 1999 +0200
@@ -2,7 +2,7 @@
 # DO NOT EDIT 
 # automatically generated from Make.proto
 #
-# $Header: /cvs/stx/stx/libview/bc.mak,v 1.30 1999-09-03 09:56:33 cg Exp $
+# $Header: /cvs/stx/stx/libview/bc.mak,v 1.31 1999-09-11 10:34:30 cg Exp $
 #
 TOP=..
 !INCLUDE $(TOP)\rules\stdHeader_nt
@@ -14,43 +14,43 @@
 OBJS=\
   $(OUTDIR)GraphicsDevice.$(O) \
   $(OUTDIR)HostGraphicsDevice.$(O) \
-  $(OUTDIR)DevWorkst.$(O) \
+  $(OUTDIR)DeviceWorkstation.$(O) \
   $(OUTDIR)Image.$(O) \
   $(OUTDIR)Depth1Image.$(O) \
   $(OUTDIR)Depth2Image.$(O) \
   $(OUTDIR)Depth4Image.$(O) \
   $(OUTDIR)Depth8Image.$(O) \
   $(OUTDIR)Depth24Image.$(O) \
-  $(OUTDIR)ImageRdr.$(O) \
-  $(OUTDIR)Workstat.$(O) \
+  $(OUTDIR)ImageReader.$(O) \
+  $(OUTDIR)Workstation.$(O) \
   $(OUTDIR)Color.$(O) \
   $(OUTDIR)Colormap.$(O) \
-  $(OUTDIR)FontDescr.$(O) \
+  $(OUTDIR)FontDescription.$(O) \
   $(OUTDIR)Font.$(O) \
   $(OUTDIR)Cursor.$(O) \
-  $(OUTDIR)DevHandle.$(O) \
-  $(OUTDIR)GC.$(O) \
-  $(OUTDIR)DevGC.$(O) \
-  $(OUTDIR)GMedium.$(O) \
+  $(OUTDIR)DeviceHandle.$(O) \
+  $(OUTDIR)GraphicsContext.$(O) \
+  $(OUTDIR)DeviceGraphicsContext.$(O) \
+  $(OUTDIR)GraphicsMedium.$(O) \
   $(OUTDIR)Form.$(O) \
-  $(OUTDIR)DSurface.$(O) \
+  $(OUTDIR)DisplaySurface.$(O) \
   $(OUTDIR)SimpleView.$(O) \
   $(OUTDIR)View.$(O) \
   $(OUTDIR)TopView.$(O) \
-  $(OUTDIR)StdSysV.$(O) \
+  $(OUTDIR)StandardSystemView.$(O) \
   $(OUTDIR)ModalBox.$(O) \
   $(OUTDIR)PopUpView.$(O) \
-  $(OUTDIR)ShadowV.$(O) \
-  $(OUTDIR)DRootView.$(O) \
-  $(OUTDIR)Controll.$(O) \
-  $(OUTDIR)WTrans.$(O) \
-  $(OUTDIR)WEvent.$(O) \
-  $(OUTDIR)WGroup.$(O) \
-  $(OUTDIR)WSensor.$(O) \
-  $(OUTDIR)SWSensor.$(O) \
-  $(OUTDIR)KeybdFwd.$(O) \
-  $(OUTDIR)KeybdMap.$(O) \
-  $(OUTDIR)RsrcPack.$(O) \
+  $(OUTDIR)ShadowView.$(O) \
+  $(OUTDIR)DisplayRootView.$(O) \
+  $(OUTDIR)Controller.$(O) \
+  $(OUTDIR)WindowingTransformation.$(O) \
+  $(OUTDIR)WindowEvent.$(O) \
+  $(OUTDIR)WindowGroup.$(O) \
+  $(OUTDIR)WindowSensor.$(O) \
+  $(OUTDIR)SynchronousWindowSensor.$(O) \
+  $(OUTDIR)KeyboardForwarder.$(O) \
+  $(OUTDIR)KeyboardMap.$(O) \
+  $(OUTDIR)ResourcePack.$(O) \
   $(OUTDIR)ViewStyle.$(O) \
   $(OUTDIR)Depth16Image.$(O) \
   $(OUTDIR)Depth32Image.$(O) \
@@ -70,7 +70,7 @@
 $(OUTDIR)Depth8Image.$(O): Depth8Image.st
 $(OUTDIR)Depth24Image.$(O): Depth24Image.st
 $(OUTDIR)ImageRdr.$(O): ImageRdr.st
-$(OUTDIR)Workstat.$(O): Workstat.st
+$(OUTDIR)Workstation.$(O): Workstation.st
 $(OUTDIR)Color.$(O): Color.st
 $(OUTDIR)Colormap.$(O): Colormap.st
 $(OUTDIR)FontDescr.$(O): FontDescr.st
@@ -131,7 +131,7 @@
 $(OUTDIR)FontDescr.$(O): FontDescr.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)Form.$(O): Form.st $(STCHDR)  ../include/GMedium.$(H)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H)  ../include/DevHandle.$(H) 
 $(OUTDIR)GC.$(O): GC.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)GLXWorkstat.$(O): GLXWorkstat.st $(STCHDR)  ../include/XWorkstat.$(H)  ../include/DevWorkst.$(H)  ../include/HostGraphicsDevice.$(H)  ../include/GraphicsDevice.$(H)  ../include/Object.$(H) 
+$(OUTDIR)GLXWorkstation.$(O): GLXWorkstation.st $(STCHDR)  ../include/XWorkstation.$(H)  ../include/DevWorkst.$(H)  ../include/HostGraphicsDevice.$(H)  ../include/GraphicsDevice.$(H)  ../include/Object.$(H) 
 $(OUTDIR)GMedium.$(O): GMedium.st $(STCHDR)  ../include/DevGC.$(H)  ../include/GC.$(H)  ../include/Object.$(H) 
 $(OUTDIR)GraphAttr.$(O): GraphAttr.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)GraphicsDevice.$(O): GraphicsDevice.st $(STCHDR)  ../include/Object.$(H) 
@@ -156,6 +156,6 @@
 $(OUTDIR)WGroup.$(O): WGroup.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)WSensor.$(O): WSensor.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)WTrans.$(O): WTrans.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)WinWorkstat.$(O): WinWorkstat.st $(STCHDR)  ../include/DevWorkst.$(H)  ../include/HostGraphicsDevice.$(H)  ../include/GraphicsDevice.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Workstat.$(O): Workstat.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)XWorkstat.$(O): XWorkstat.st $(STCHDR)  ../include/DevWorkst.$(H)  ../include/HostGraphicsDevice.$(H)  ../include/GraphicsDevice.$(H)  ../include/Object.$(H) 
+$(OUTDIR)WinWorkstation.$(O): WinWorkstation.st $(STCHDR)  ../include/DevWorkst.$(H)  ../include/HostGraphicsDevice.$(H)  ../include/GraphicsDevice.$(H)  ../include/Object.$(H) 
+$(OUTDIR)Workstation.$(O): Workstation.st $(STCHDR)  ../include/Object.$(H) 
+$(OUTDIR)XWorkstation.$(O): XWorkstation.st $(STCHDR)  ../include/DevWorkst.$(H)  ../include/HostGraphicsDevice.$(H)  ../include/GraphicsDevice.$(H)  ../include/Object.$(H)