--- a/bc.mak	Mon May 06 16:39:30 2013 +0200
+++ b/bc.mak	Mon May 06 16:39:32 2013 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/bc.mak,v 1.96 2013-01-25 12:26:08 stefan Exp $
+# $Header: /cvs/stx/stx/libview2/bc.mak,v 1.97 2013-05-06 14:39:32 cg Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -33,7 +33,7 @@
 !INCLUDE Make.spec
 
 LIBNAME=libstx_libview2
-RESFILES=libview2.res
+RESFILES=libview2.$(RES)
 
 
 LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
@@ -47,7 +47,7 @@
 CLOCAL_INCL=-I"$(LIBJPEG_DIR)"
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libview
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
@@ -61,14 +61,14 @@
 
 !INCLUDE $(TOP)\rules\stdRules_bc
 
-# build all prerequisite packages for this package
+# build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
+
 $(LIBJPEG):
 	cd $(LIBJPEG_DIR)
 	$(MAKE_BAT)
@@ -80,6 +80,9 @@
 
 
 
+clean::
+	del *.$(CSUFFIX)
+
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)ActiveHelpView.$(O) ActiveHelpView.$(H): ActiveHelpView.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)ApplicationSubView.$(O) ApplicationSubView.$(H): ApplicationSubView.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)
@@ -105,6 +108,7 @@
 $(OUTDIR)Layout.$(O) Layout.$(H): Layout.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)MIMETypeIconLibrary.$(O) MIMETypeIconLibrary.$(H): MIMETypeIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)MIMETypes.$(O) MIMETypes.$(H): MIMETypes.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(STCHDR)
+$(OUTDIR)MacOSXIconReader.$(O) MacOSXIconReader.$(H): MacOSXIconReader.st $(INCLUDE_TOP)\stx\libview\ImageReader.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(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)