Make.proto
changeset 2711 cb2fbe895771
parent 2653 f3097a87a959
child 2718 9f5295ebaf92
--- a/Make.proto	Wed Aug 05 15:23:49 2009 +0200
+++ b/Make.proto	Wed Aug 05 20:34:09 2009 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.115 2009-05-07 11:20:01 stefan Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.116 2009-08-05 18:34:09 cg Exp $
 #
 # DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libview2.
@@ -131,10 +131,10 @@
 postMake:: cleanjunk
 
 prereq: $(REQUIRED_SUPPORT_DIRS)
-	(cd ../libbasic ; $(MAKE))
-	(cd ../libbasic2 ; $(MAKE))
-	(cd ../libview ; $(MAKE))
-	(cd ../librun ; $(MAKE))
+	cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
@@ -174,6 +174,7 @@
 $(OUTDIR)MenuItem.$(O) MenuItem.$(H): MenuItem.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Model.$(O) Model.$(H): Model.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)MultiImage.$(O) MultiImage.$(H): MultiImage.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PNGReader.$(O) PNGReader.$(H): PNGReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PopUpBanner.$(O) PopUpBanner.$(H): PopUpBanner.st $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PrintConverter.$(O) PrintConverter.$(H): PrintConverter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PrinterContext.$(O) PrinterContext.$(H): PrinterContext.st $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -182,7 +183,6 @@
 $(OUTDIR)StandardSystemController.$(O) StandardSystemController.$(H): StandardSystemController.st $(INCLUDE_TOP)/stx/libview/Controller.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)TIFFReader.$(O) TIFFReader.$(H): TIFFReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)TransparentBox.$(O) TransparentBox.$(H): TransparentBox.st $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VisualComponent.$(O) VisualComponent.$(H): VisualComponent.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)VisualRegion.$(O) VisualRegion.$(H): VisualRegion.st $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)WindowBuilder.$(O) WindowBuilder.$(H): WindowBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)WindowsIconReader.$(O) WindowsIconReader.$(H): WindowsIconReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -195,7 +195,7 @@
 $(OUTDIR)Plug.$(O) Plug.$(H): Plug.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UIBuilder.$(O) UIBuilder.$(H): UIBuilder.st $(INCLUDE_TOP)/stx/libview2/WindowBuilder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ValueModel.$(O) ValueModel.$(H): ValueModel.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VisualPart.$(O) VisualPart.$(H): VisualPart.st $(INCLUDE_TOP)/stx/libview2/VisualComponent.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VisualComponent.$(O) VisualComponent.$(H): VisualComponent.st $(INCLUDE_TOP)/stx/libview2/DisplayObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)AlignmentOrigin.$(O) AlignmentOrigin.$(H): AlignmentOrigin.st $(INCLUDE_TOP)/stx/libview2/LayoutOrigin.$(H) $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)BlockValue.$(O) BlockValue.$(H): BlockValue.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)FlyByHelp.$(O) FlyByHelp.$(H): FlyByHelp.st $(INCLUDE_TOP)/stx/libview2/ActiveHelp.$(H) $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -206,6 +206,7 @@
 $(OUTDIR)SimpleDialog.$(O) SimpleDialog.$(H): SimpleDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ToolApplicationModel.$(O) ToolApplicationModel.$(H): ToolApplicationModel.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ValueHolder.$(O) ValueHolder.$(H): ValueHolder.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VisualPart.$(O) VisualPart.$(H): VisualPart.st $(INCLUDE_TOP)/stx/libview2/VisualComponent.$(H) $(INCLUDE_TOP)/stx/libview2/DisplayObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)AspectAdaptor.$(O) AspectAdaptor.$(H): AspectAdaptor.st $(INCLUDE_TOP)/stx/libview2/ProtocolAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)BooleanBlockValue.$(O) BooleanBlockValue.$(H): BooleanBlockValue.st $(INCLUDE_TOP)/stx/libview2/BlockValue.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)BooleanValueHolder.$(O) BooleanValueHolder.$(H): BooleanValueHolder.st $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)