--- a/bc.mak	Wed Jan 17 14:38:10 2007 +0100
+++ b/bc.mak	Wed Jan 17 14:39:07 2007 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.86 2007-01-11 17:09:18 stefan Exp $
+# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.87 2007-01-17 13:39:07 stefan Exp $
 #
 # DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libbasic2.
@@ -23,7 +23,7 @@
 
 LIBNAME=libstx_libbasic2
 RESFILES=libbasic2.res
-LOCALINCLUDES=-I$(TOP)\support -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES=-I$(ZLIB_DIR) -I$(INCLUDE_TOP)\stx\libbasic
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
 LOCALLIBS=$(ZLIB)
@@ -43,13 +43,13 @@
 
 $(ZLIB):
 	cd $(ZLIB_DIR)
-	$(MAKE) $(MAKE_ZLIB_ARG)
-	cd $(TOP)\stx\libbasic2
+	$(MAKE) $(MAKE_ZLIB_ARG) zlib.lib
+	cd ..\..\libbasic2
 
 $(BZ2LIB):
 	cd $(BZ2LIB_DIR)
 	$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
-	cd $(TOP)\stx\libbasic2
+	cd ..\..\libbasic2
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
@@ -118,6 +118,7 @@
 $(OUTDIR)FtpURI.$(O) FtpURI.$(H): FtpURI.st $(INCLUDE_TOP)\stx\libbasic2\HierarchicalURI.$(H) $(INCLUDE_TOP)\stx\libbasic2\URI.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)HttpURI.$(O) HttpURI.$(H): HttpURI.st $(INCLUDE_TOP)\stx\libbasic2\HierarchicalURI.$(H) $(INCLUDE_TOP)\stx\libbasic2\URI.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)IPv6SocketAddress.$(O) IPv6SocketAddress.$(H): IPv6SocketAddress.st $(INCLUDE_TOP)\stx\libbasic2\IPSocketAddress.$(H) $(INCLUDE_TOP)\stx\libbasic2\SocketAddress.$(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) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SerialPort.$(O) SerialPort.$(H): SerialPort.st $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line