bc.mak
changeset 1953 16f3f5c0d341
parent 1946 a2c3951c6dce
child 1959 41ab733f38a5
--- a/bc.mak	Wed Apr 16 19:34:23 2008 +0200
+++ b/bc.mak	Wed Apr 16 19:34:29 2008 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.93 2008-04-10 15:07:23 stefan Exp $
+# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.94 2008-04-16 17:34:29 stefan Exp $
 #
 # DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libbasic2.
@@ -33,7 +33,7 @@
 LOCALINCLUDES=-I$(ZLIB_DIR) -I$(INCLUDE_TOP)\stx\libbasic
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
-LOCALLIBS=$(ZLIB)
+LOCALLIBS=$(ZLIB_DIR)\$(ZLIB)
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
@@ -44,7 +44,7 @@
 
 $(ZLIB):
 	cd $(ZLIB_DIR)
-	$(MAKE) $(MAKE_ZLIB_ARG) zlib.lib
+	$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
 	cd ..\..\libbasic2
 
 $(BZ2LIB):
@@ -123,7 +123,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)SerialPort.$(O) SerialPort.$(H): SerialPort.st $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line