--- a/Make.proto	Fri Nov 21 16:04:41 2003 +0100
+++ b/Make.proto	Fri Nov 21 16:39:44 2003 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.86 2003-10-29 10:45:21 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.87 2003-11-21 15:39:44 cg Exp $
 #
 # -------------- no need to change anything below ----------
 
@@ -42,76 +42,76 @@
 # these are compiled with +optSpace
 #
 UNCRITICALOBJS= \
-	  ColorValue.$(O)                 \
-	  Icon.$(O)                     \
-	  InputView.$(O)                \
-	  BlockValue.$(O)               \
-	  PrintConverter.$(O)           \
-	  EventListener.$(O)            \
-	  MIMETypes.$(O)                \
-	  ActiveHelp.$(O)               \
-	  ActiveHelpView.$(O)           \
-	  KeyboardProcessor.$(O)        \
-	  ToolApplicationModel.$(O)     \
-	    ResourceSpecEditor.$(O)     \
-	  MultiImage.$(O)
+	  $(OUTDIR)ColorValue.$(O)                 \
+	  $(OUTDIR)Icon.$(O)                     \
+	  $(OUTDIR)InputView.$(O)                \
+	  $(OUTDIR)BlockValue.$(O)               \
+	  $(OUTDIR)PrintConverter.$(O)           \
+	  $(OUTDIR)EventListener.$(O)            \
+	  $(OUTDIR)MIMETypes.$(O)                \
+	  $(OUTDIR)ActiveHelp.$(O)               \
+	  $(OUTDIR)ActiveHelpView.$(O)           \
+	  $(OUTDIR)KeyboardProcessor.$(O)        \
+	  $(OUTDIR)ToolApplicationModel.$(O)     \
+	    $(OUTDIR)ResourceSpecEditor.$(O)     \
+	  $(OUTDIR)MultiImage.$(O)
 
 OBJS= \
-	  ColorValue.$(O)               \
-	  Icon.$(O)                     \
-	  DisplayObject.$(O)            \
-	  InputView.$(O)                \
-	  PrintConverter.$(O)           \
-	  MIMETypes.$(O)                \
-	  ApplicationWindow.$(O)        \
-	  Model.$(O)                    \
-	    ApplicationModel.$(O)       \
-		ToolApplicationModel.$(O) \
-		    ResourceSpecEditor.$(O) \
-	    ValueModel.$(O)             \
-		PluggableAdaptor.$(O)   \
-		  TypeConverter.$(O)    \
-		BlockValue.$(O)         \
-		ValueHolder.$(O)        \
-		  ValueHolderWithWeakDependents.$(O) \
-		  TriggerValue.$(O)     \
-		  ProtocolAdaptor.$(O)  \
-		    AspectAdaptor.$(O)  \
-		BufferedValueHolder.$(O) \
-		IndirectValue.$(O) \
-	      Plug.$(O)                 \
-	  StandardSystemController.$(O) \
-	  Layout.$(O)                   \
-	    LayoutOrigin.$(O)           \
-	      LayoutFrame.$(O)          \
-		AlignmentOrigin.$(O)    \
-	  EventListener.$(O)            \
-	    ActiveHelp.$(O)             \
-	  ActiveHelpView.$(O)           \
-	  KeyboardProcessor.$(O)        \
-	  Menu.$(O)                     \
-	  MenuItem.$(O)                 \
-	  DragAndDropManager.$(O)       \
-	  DropObject.$(O)               \
-	  DropContext.$(O)              \
-	  DropSource.$(O)               \
-	  DropTarget.$(O)               \
-	  DragHandler.$(O)              \
-	  VisualRegion.$(O)             \
-	  ResourceRetriever.$(O)        \
-	  WindowBuilder.$(O)            \
-	      UIBuilder.$(O)            \
-	      TIFFReader.$(O)           \
-	      GIFReader.$(O)            \
-	      XBMReader.$(O)            \
-	      XPMReader.$(O)            \
-	      $(JPEGREADER)             \
-	  PopUpBanner.$(O)              \
-	  SimpleDialog.$(O)             \
-	  FlyByHelp.$(O)                \
-	  ApplicationSubView.$(O)       \
-	  PropertyListDictionary.$(O)   \
-	  MultiImage.$(O)
+	  $(OUTDIR)ColorValue.$(O)               \
+	  $(OUTDIR)Icon.$(O)                     \
+	  $(OUTDIR)DisplayObject.$(O)            \
+	  $(OUTDIR)InputView.$(O)                \
+	  $(OUTDIR)PrintConverter.$(O)           \
+	  $(OUTDIR)MIMETypes.$(O)                \
+	  $(OUTDIR)ApplicationWindow.$(O)        \
+	  $(OUTDIR)Model.$(O)                    \
+	    $(OUTDIR)ApplicationModel.$(O)       \
+		$(OUTDIR)ToolApplicationModel.$(O) \
+		    $(OUTDIR)ResourceSpecEditor.$(O) \
+	    $(OUTDIR)ValueModel.$(O)             \
+		$(OUTDIR)PluggableAdaptor.$(O)   \
+		  $(OUTDIR)TypeConverter.$(O)    \
+		$(OUTDIR)BlockValue.$(O)         \
+		$(OUTDIR)ValueHolder.$(O)        \
+		  $(OUTDIR)ValueHolderWithWeakDependents.$(O) \
+		  $(OUTDIR)TriggerValue.$(O)     \
+		  $(OUTDIR)ProtocolAdaptor.$(O)  \
+		    $(OUTDIR)AspectAdaptor.$(O)  \
+		$(OUTDIR)BufferedValueHolder.$(O) \
+		$(OUTDIR)IndirectValue.$(O) \
+	      $(OUTDIR)Plug.$(O)                 \
+	  $(OUTDIR)StandardSystemController.$(O) \
+	  $(OUTDIR)Layout.$(O)                   \
+	    $(OUTDIR)LayoutOrigin.$(O)           \
+	      $(OUTDIR)LayoutFrame.$(O)          \
+		$(OUTDIR)AlignmentOrigin.$(O)    \
+	  $(OUTDIR)EventListener.$(O)            \
+	    $(OUTDIR)ActiveHelp.$(O)             \
+	  $(OUTDIR)ActiveHelpView.$(O)           \
+	  $(OUTDIR)KeyboardProcessor.$(O)        \
+	  $(OUTDIR)Menu.$(O)                     \
+	  $(OUTDIR)MenuItem.$(O)                 \
+	  $(OUTDIR)DragAndDropManager.$(O)       \
+	  $(OUTDIR)DropObject.$(O)               \
+	  $(OUTDIR)DropContext.$(O)              \
+	  $(OUTDIR)DropSource.$(O)               \
+	  $(OUTDIR)DropTarget.$(O)               \
+	  $(OUTDIR)DragHandler.$(O)              \
+	  $(OUTDIR)VisualRegion.$(O)             \
+	  $(OUTDIR)ResourceRetriever.$(O)        \
+	  $(OUTDIR)WindowBuilder.$(O)            \
+	      $(OUTDIR)UIBuilder.$(O)            \
+	      $(OUTDIR)TIFFReader.$(O)           \
+	      $(OUTDIR)GIFReader.$(O)            \
+	      $(OUTDIR)XBMReader.$(O)            \
+	      $(OUTDIR)XPMReader.$(O)            \
+	      $(JPEGREADER)                      \
+	  $(OUTDIR)PopUpBanner.$(O)              \
+	  $(OUTDIR)SimpleDialog.$(O)             \
+	  $(OUTDIR)FlyByHelp.$(O)                \
+	  $(OUTDIR)ApplicationSubView.$(O)       \
+	  $(OUTDIR)PropertyListDictionary.$(O)   \
+	  $(OUTDIR)MultiImage.$(O)
 
 pre_objs:: JPEGReader