zlib is a static library, not (necessarily) a driver library. Moved it back to reactos/lib (who moved it?)

svn path=/trunk/; revision=4419

reactos/Makefile

@@ -30,7 +30,7 @@ BUS = acpi isapnp pci
 # advapi32 crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll ole32
 # oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2help ws2_32 wsock32 wshirda
 DLLS = advapi32 crtdll fmifs gdi32 kernel32 packet msafd msvcrt ntdll \
-       secur32 user32 version winedbgc ws2help ws2_32 wshirda #winmm 
+       secur32 user32 version winedbgc ws2help ws2_32 wshirda zlib #winmm 
 
 SUBSYS = smss win32k csrss ntvdm
 
@@ -46,7 +46,7 @@ LOADERS = dos
 
 # Driver support libraries
 #bzip2 zlib
-DRIVERS_LIB = bzip2 zlib
+DRIVERS_LIB = bzip2
 
 # Kernel mode device drivers
 # Obsolete: ide

reactos/drivers/lib/zlib/makefile.reactos

@@ -1,26 +0,0 @@
-# $Id: makefile.reactos,v 1.2 2002/06/07 22:59:01 ekohl Exp $
-
-PATH_TO_TOP = ../../..
-
-TARGET_TYPE = library
-
-TARGET_NAME = zlib
-
-TARGET_CFLAGS = \
- -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
- -Wstrict-prototypes -Wmissing-prototypes
-
-TARGET_OBJECTS = \
- adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o zutil.o \
- inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
- 
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# FIXME: this rule should be defined in helper.mk
-$(TARGET_NAME).nostrip.a:
-	@echo FIXME!
-	@echo FIXME!>$@
-
-# EOF

reactos/lib/zlib/ChangeLog

@@ -225,7 +225,7 @@ Changes in 1.0.6 (19 Jan 1998)
 - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
 - added makelcc.bat for lcc-win32 (Tom St Denis)
 - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id: ChangeLog,v 1.1 2002/03/17 21:05:01 hyperion Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- Avoid expanded $Id: ChangeLog,v 1.1 2003/03/24 01:28:35 hyperion Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
 - check for unistd.h in configure (for off_t)
 - remove useless check parameter in inflate_blocks_free
 - avoid useless assignment of s->check to itself in inflate_blocks_new

reactos/lib/zlib/Makefile

@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.6 2003/01/01 11:11:48 robd Exp $
+# $Id: Makefile,v 1.1 2003/03/24 01:28:35 hyperion Exp $
 
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../..
 
 TARGET_TYPE = library
 

reactos/lib/zlib/adler32.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: adler32.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: adler32.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "zlib.h"
 

reactos/lib/zlib/compress.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: compress.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: compress.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "zlib.h"
 

reactos/lib/zlib/contrib/iostream2/zstream.h

@@ -21,7 +21,7 @@
 
 /*
  * zstream.h - C++ interface to the 'zlib' general purpose compression library
- * $Id: zstream.h,v 1.1 2002/03/17 21:05:04 hyperion Exp $
+ * $Id: zstream.h,v 1.1 2003/03/24 01:28:38 hyperion Exp $
  */
 
 #include <strstream.h>

reactos/lib/zlib/crc32.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: crc32.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: crc32.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "zlib.h"
 

reactos/lib/zlib/deflate.c

@@ -47,7 +47,7 @@
  *
  */
 
-/* @(#) $Id: deflate.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: deflate.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "deflate.h"
 

reactos/lib/zlib/deflate.h

@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: deflate.h,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: deflate.h,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H

reactos/lib/zlib/example.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: example.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: example.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"

reactos/lib/zlib/gzio.c

@@ -5,7 +5,7 @@
  * Compile this file with -DNO_DEFLATE to avoid the compression code.
  */
 
-/* @(#) $Id: gzio.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: gzio.c,v 1.1 2003/03/24 01:28:36 hyperion Exp $ */
 
 #include <stdio.h>
 

reactos/lib/zlib/minigzip.c

@@ -13,7 +13,7 @@
  * or in pipe mode.
  */
 
-/* @(#) $Id: minigzip.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: minigzip.c,v 1.1 2003/03/24 01:28:36 hyperion Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"

reactos/lib/zlib/trees.c

@@ -29,7 +29,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $Id: trees.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: trees.c,v 1.1 2003/03/24 01:28:36 hyperion Exp $ */
 
 /* #define GEN_TREES_H */