--- a/nt.mak	Thu Dec 09 12:15:01 1999 +0100
+++ b/nt.mak	Fri Dec 10 16:13:16 1999 +0100
@@ -1,9 +1,8 @@
 #
 # DO NOT EDIT 
 # automatically generated from Make.proto (by make nt.mak)
-# but manually edited for libjpeg (sigh)
 #
-# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.31 1999-12-03 15:09:10 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.32 1999-12-10 15:13:16 cg Exp $
 #
 TOP=..
 #
@@ -15,17 +14,7 @@
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview2 +commonSymbols -varPrefix=libview2"
 
-LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
-LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib
-CLOCAL_INCL=-I$(LIBJPEG_DIR)
-LOCALLIBS=$(LIBJPEG)
-
-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) \
@@ -88,6 +77,7 @@
 $(OUTDIR)AlignmentOrigin.$(O) AlignmentOrigin.$(H): AlignmentOrigin.st $(STCHDR)  ../include/LayoutOrigin.$(H)  ../include/Layout.$(H)  ../include/Object.$(H) 
 $(OUTDIR)ApplicationController.$(O) ApplicationController.$(H): ApplicationController.st $(STCHDR) 
 $(OUTDIR)ApplicationModel.$(O) ApplicationModel.$(H): ApplicationModel.st $(STCHDR)  ../include/Model.$(H)  ../include/Object.$(H) 
+$(OUTDIR)ApplicationSubView.$(O) ApplicationSubView.$(H): ApplicationSubView.st $(STCHDR)  ../include/View.$(H)  ../include/SimpleView.$(H)  ../include/DisplaySurface.$(H)  ../include/GraphicsMedium.$(H)  ../include/DeviceGraphicsContext.$(H)  ../include/GraphicsContext.$(H)  ../include/Object.$(H) 
 $(OUTDIR)ApplicationWindow.$(O) ApplicationWindow.$(H): ApplicationWindow.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)AspectAdaptor.$(O) AspectAdaptor.$(H): AspectAdaptor.st $(STCHDR)  ../include/ProtocolAdaptor.$(H)  ../include/ValueModel.$(H)  ../include/Model.$(H)  ../include/Object.$(H) 
 $(OUTDIR)BlitImageReader.$(O) BlitImageReader.$(H): BlitImageReader.st $(STCHDR)  ../include/ImageReader.$(H)  ../include/Object.$(H)