--- a/nt.mak	Fri Dec 03 15:36:40 1999 +0100
+++ b/nt.mak	Fri Dec 03 15:57:50 1999 +0100
@@ -1,30 +1,20 @@
 #
 # DO NOT EDIT 
-# automatically generated from Make.proto
+# automatically generated from Make.proto (by make nt.mak)
 #
-# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.29 1999-10-29 13:26:01 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.30 1999-12-03 14:57:50 cg Exp $
 #
 TOP=..
 #
 !INCLUDE $(TOP)\rules\stdHeader_nt
 #
-LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
-LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib
-CLOCAL_INCL=-I$(LIBJPEG_DIR)
-LOCALLIBS=$(LIBJPEG)
-
 LIBNAME=libview2
 LIB_BASE=$(LIBVIEW2_BASE)
 STCOPT="+optspace2 -warnNonStandard"
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview2 +commonSymbols -varPrefix=libview2"
 
-ALL: $(LIBJPEG) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-
-$(LIBJPEG):
-	cd $(LIBJPEG_DIR)
-	make.exe -f makefile.bcc32
-	cd $(TOP)\libview2
+ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
 
 OBJS=\
   $(OUTDIR)ColorValue.$(O) \
@@ -43,6 +33,7 @@
   $(OUTDIR)TypeConverter.$(O) \
   $(OUTDIR)BlockValue.$(O) \
   $(OUTDIR)ValueHolder.$(O) \
+  $(OUTDIR)ValueHolderWithWeakDependents.$(O) \
   $(OUTDIR)TriggerValue.$(O) \
   $(OUTDIR)ProtocolAdaptor.$(O) \
   $(OUTDIR)AspectAdaptor.$(O) \
@@ -74,7 +65,6 @@
   $(OUTDIR)XPMReader.$(O) \
   $(OUTDIR)JPEGReader.$(O) \
   $(OUTDIR)SimpleDialog.$(O) \
-  $(OUTDIR)ValueHolderWithWeakDependents.$(O) \
 
 
 !INCLUDE $(TOP)\rules\stdRules_nt
@@ -96,9 +86,11 @@
 $(OUTDIR)BufferedValueHolder.$(O) BufferedValueHolder.$(H): BufferedValueHolder.st $(STCHDR)  ../include/ValueHolder.$(H)  ../include/ValueModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
 $(OUTDIR)ColorValue.$(O) ColorValue.$(H): ColorValue.st $(STCHDR)  ../include/Color.$(H)  ../include/Object.$(H) 
 $(OUTDIR)CompositePart.$(O) CompositePart.$(H): CompositePart.st $(STCHDR) 
+$(OUTDIR)CompositeTransform.$(O) CompositeTransform.$(H): CompositeTransform.st $(STCHDR) 
 $(OUTDIR)ConvertedValue.$(O) ConvertedValue.$(H): ConvertedValue.st $(STCHDR)  ../include/ValueHolder.$(H)  ../include/ValueModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
 $(OUTDIR)DependentPart.$(O) DependentPart.$(H): DependentPart.st $(STCHDR) 
 $(OUTDIR)DisplayObject.$(O) DisplayObject.$(H): DisplayObject.st $(STCHDR)  ../include/Object.$(H) 
+$(OUTDIR)DisplayTransform.$(O) DisplayTransform.$(H): DisplayTransform.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)DragAndDropManager.$(O) DragAndDropManager.$(H): DragAndDropManager.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)DragHandler.$(O) DragHandler.$(H): DragHandler.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)DropContext.$(O) DropContext.$(H): DropContext.st $(STCHDR)  ../include/Object.$(H) 
@@ -126,6 +118,7 @@
 $(OUTDIR)LayoutOrigin.$(O) LayoutOrigin.$(H): LayoutOrigin.st $(STCHDR)  ../include/Layout.$(H)  ../include/Object.$(H) 
 $(OUTDIR)LayoutWrapper.$(O) LayoutWrapper.$(H): LayoutWrapper.st $(STCHDR) 
 $(OUTDIR)MIMETypes.$(O) MIMETypes.$(H): MIMETypes.st $(STCHDR)  ../include/Object.$(H) 
+$(OUTDIR)MatrixTransform2x3.$(O) MatrixTransform2x3.$(H): MatrixTransform2x3.st $(STCHDR) 
 $(OUTDIR)Menu.$(O) Menu.$(H): Menu.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)MenuItem.$(O) MenuItem.$(H): MenuItem.st $(STCHDR)  ../include/Object.$(H) 
 $(OUTDIR)Model.$(O) Model.$(H): Model.st $(STCHDR)  ../include/Object.$(H) 
@@ -154,6 +147,7 @@
 $(OUTDIR)TypeConverter.$(O) TypeConverter.$(H): TypeConverter.st $(STCHDR)  ../include/PluggableAdaptor.$(H)  ../include/ValueModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
 $(OUTDIR)UIBuilder.$(O) UIBuilder.$(H): UIBuilder.st $(STCHDR)  ../include/WindowBuilder.$(H)  ../include/Object.$(H) 
 $(OUTDIR)ValueHolder.$(O) ValueHolder.$(H): ValueHolder.st $(STCHDR)  ../include/ValueModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)ValueHolderWithWeakDependents.$(O) ValueHolderWithWeakDependents.$(H): ValueHolderWithWeakDependents.st $(STCHDR)  ../include/ValueHolder.$(H)  ../include/ValueModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
 $(OUTDIR)ValueModel.$(O) ValueModel.$(H): ValueModel.st $(STCHDR)  ../include/Model.$(H)  ../include/Object.$(H) 
 $(OUTDIR)ViewForwardingController.$(O) ViewForwardingController.$(H): ViewForwardingController.st $(STCHDR)  ../include/Controller.$(H)  ../include/Object.$(H) 
 $(OUTDIR)VisualComponent.$(O) VisualComponent.$(H): VisualComponent.st $(STCHDR)  ../include/Object.$(H)