zlib 0.99v0.99

4 files changed, 219 insertions, 107 deletions

diff --git a/Makefile b/Makefile
index d9e11c5..fe5b372 100644
--- a/Makefile
+++ b/Makefile
@@ -1,73 +1,130 @@
 # Makefile for zlib
-# Copyright (C) 1995 Jean-loup Gailly.
+# Copyright (C) 1995-1996 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 
+# To compile and test, type:
+#   ./configure; make test
+# The call of configure is optional if you don't have special requirements
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
 CC=cc
+
 CFLAGS=-O
-#use -O3 for gcc to take advantage of inlining
-#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
 LDFLAGS=-L. -lz
+LDSHARED=$(CC)
 
+VER=1.0
+LIBS=libz.a
+
+AR=ar rc
 RANLIB=ranlib
+TAR=tar
 
 prefix=/usr/local
+exec_prefix = $(prefix)
 
 OBJS = 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
 
 TEST_OBJS = example.o minigzip.o
 
+DISTFILES = README ChangeLog configure Makefile.in Makefile Makefile.msc \
+            Makefile.bor Makefile.tc Make_vms.com descrip.mms *.[ch]
+
 all: example minigzip
 
 test: all
         ./example
         echo hello world | ./minigzip | ./minigzip -d 
 
-install: libz.a
-        -@mkdir $(prefix)/include
-        -@mkdir $(prefix)/lib
-        cp zlib.h zconf.h $(prefix)/include
-        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-        cp libz.a $(prefix)/lib
-        chmod 644 $(prefix)/lib/libz.a
-
 libz.a: $(OBJS)
-        ar rc $@ $(OBJS)
-        $(RANLIB) $@
+        $(AR) $@ $(OBJS)
+        -@ ($(RANLIB) $@ || true) 2>/dev/null
 
-example: example.o libz.a
+libz.so.$(VER): $(OBJS)
+        $(LDSHARED) -o $@ $(OBJS)
+        rm -f libz.so; ln -s $@ libz.so
+
+example: example.o $(LIBS)
         $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
 
-minigzip: minigzip.o libz.a
+minigzip: minigzip.o $(LIBS)
         $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
+install: $(LIBS)
+        -@if [ ! $(prefix)/include  ]; then mkdir $(prefix)/include; fi
+        -@if [ ! $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
+        cp zlib.h zconf.h $(prefix)/include
+        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+        cp $(LIBS) $(exec_prefix)/lib
+        cd $(exec_prefix)/lib; chmod 644 $(LIBS)
+        -@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
+        cd $(exec_prefix)/lib; if test -f libz.so.$(VER); then \
+          ln -s libz.so.$(VER) libz.so; \
+        fi
+# The ranlib in install is needed on NeXTSTEP which checks file times
+
+uninstall:
+        cd $(exec_prefix)/lib; rm -f $(LIBS); \
+        if test -f libz.so; then \
+         v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p'<$(prefix)/include/zlib.h`;\
+         rm -f libz.so.$$v libz.so; \
+        fi
+        cd $(prefix)/include; rm -f zlib.h zconf.h
+
 clean:
-        rm -f *.o example minigzip libz.a foo.gz
+        rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
 
 zip:
-        zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
-          descrip.mms *.[ch]
-
-tgz:
-        cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-          zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
+        mv Makefile Makefile~; cp -p Makefile.in Makefile
+        v=`sed -n -e 's/\./-/' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+        zip -ul9 zlib-$$v $(DISTFILES)
+        mv Makefile~ Makefile
+
+dist:
+        mv Makefile Makefile~; cp -p Makefile.in Makefile
+        d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+        rm -f $$d.tar.gz; \
+        if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
+        files=""; \
+        for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
+        cd ..; \
+        GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
+        if test ! -d $$d; then rm -f $$d; fi
+        mv Makefile~ Makefile
+
+tags:   
+        etags *.[ch]
+
+depend:
+        makedepend -- $(CFLAGS) -- *.[ch]
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-adler32.o: zutil.h zlib.h zconf.h
+adler32.o: zlib.h zconf.h
 compress.o: zlib.h zconf.h
-crc32.o: zutil.h zlib.h zconf.h
+crc32.o: zlib.h zconf.h
 deflate.o: deflate.h zutil.h zlib.h zconf.h
 example.o: zlib.h zconf.h
 gzio.o: zutil.h zlib.h zconf.h
-infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
+infcodes.o: zutil.h zlib.h zconf.h
+infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h
+inffast.o: infblock.h infcodes.h infutil.h inffast.h
 inflate.o: zutil.h zlib.h zconf.h infblock.h
 inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h
+infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+minigzip.o:  zlib.h zconf.h 
+trees.o: deflate.h zutil.h zlib.h zconf.h 
 uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h  
diff --git a/Makefile.bor b/Makefile.bor
index 536b76d..2116563 100644
--- a/Makefile.bor
+++ b/Makefile.bor
@@ -18,7 +18,7 @@ CFLAGS=-O2 -Z $(MODEL)
 CC=bcc
 LD=bcc
 LIB=tlib
-#   replace bcc with tcc for Turbo C++ 1.0
+#   replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
 LDFLAGS=$(MODEL)
 O=.obj
 
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..fe5b372
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,130 @@
+# Makefile for zlib
+# Copyright (C) 1995-1996 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
+# To compile and test, type:
+#   ./configure; make test
+# The call of configure is optional if you don't have special requirements
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+LDFLAGS=-L. -lz
+LDSHARED=$(CC)
+
+VER=1.0
+LIBS=libz.a
+
+AR=ar rc
+RANLIB=ranlib
+TAR=tar
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = 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
+
+TEST_OBJS = example.o minigzip.o
+
+DISTFILES = README ChangeLog configure Makefile.in Makefile Makefile.msc \
+            Makefile.bor Makefile.tc Make_vms.com descrip.mms *.[ch]
+
+all: example minigzip
+
+test: all
+        ./example
+        echo hello world | ./minigzip | ./minigzip -d 
+
+libz.a: $(OBJS)
+        $(AR) $@ $(OBJS)
+        -@ ($(RANLIB) $@ || true) 2>/dev/null
+
+libz.so.$(VER): $(OBJS)
+        $(LDSHARED) -o $@ $(OBJS)
+        rm -f libz.so; ln -s $@ libz.so
+
+example: example.o $(LIBS)
+        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o $(LIBS)
+        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+install: $(LIBS)
+        -@if [ ! $(prefix)/include  ]; then mkdir $(prefix)/include; fi
+        -@if [ ! $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
+        cp zlib.h zconf.h $(prefix)/include
+        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+        cp $(LIBS) $(exec_prefix)/lib
+        cd $(exec_prefix)/lib; chmod 644 $(LIBS)
+        -@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
+        cd $(exec_prefix)/lib; if test -f libz.so.$(VER); then \
+          ln -s libz.so.$(VER) libz.so; \
+        fi
+# The ranlib in install is needed on NeXTSTEP which checks file times
+
+uninstall:
+        cd $(exec_prefix)/lib; rm -f $(LIBS); \
+        if test -f libz.so; then \
+         v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p'<$(prefix)/include/zlib.h`;\
+         rm -f libz.so.$$v libz.so; \
+        fi
+        cd $(prefix)/include; rm -f zlib.h zconf.h
+
+clean:
+        rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
+
+zip:
+        mv Makefile Makefile~; cp -p Makefile.in Makefile
+        v=`sed -n -e 's/\./-/' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+        zip -ul9 zlib-$$v $(DISTFILES)
+        mv Makefile~ Makefile
+
+dist:
+        mv Makefile Makefile~; cp -p Makefile.in Makefile
+        d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+        rm -f $$d.tar.gz; \
+        if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
+        files=""; \
+        for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
+        cd ..; \
+        GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
+        if test ! -d $$d; then rm -f $$d; fi
+        mv Makefile~ Makefile
+
+tags:   
+        etags *.[ch]
+
+depend:
+        makedepend -- $(CFLAGS) -- *.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
+infcodes.o: zutil.h zlib.h zconf.h
+infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h
+inffast.o: infblock.h infcodes.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+minigzip.o:  zlib.h zconf.h 
+trees.o: deflate.h zutil.h zlib.h zconf.h 
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h  
diff --git a/Makefile.qnx b/Makefile.qnx
deleted file mode 100644
index 22b1a23..0000000
--- a/Makefile.qnx
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h 
-
-# Modified slightly for QNX by Chris Herborth (chrish@qnx.com)
-
-CC=cc
-CFLAGS=-4 -O -Q
-#use -O3 for gcc to take advantage of inlining
-#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
-#CFLAGS=-g -DDEBUG
-LDFLAGS=-L. -lz
-
-#RANLIB=ranlib
-
-prefix=/usr/local
-
-OBJS = 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
-
-TEST_OBJS = example.o minigzip.o
-
-all: example minigzip
-
-test: all
-        ./example
-        echo hello world | ./minigzip | ./minigzip -d 
-
-install: zlib.lib
-        -@mkdir $(prefix)/include
-        -@mkdir $(prefix)/lib
-        cp zlib.h zconf.h $(prefix)/include
-        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-        cp zlib.lib $(prefix)/lib
-        chmod 644 $(prefix)/lib/zlib.lib
-
-zlib.lib: $(OBJS)
-        cc -A $@ $(OBJS)
-#       ar rc $@ $(OBJS)
-#       $(RANLIB) $@
-
-example: example.o zlib.lib
-        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-
-minigzip: minigzip.o zlib.lib
-        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-
-clean:
-        rm -f *.o example minigzip zlib.lib foo.gz
-
-zip:
-        zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
-
-tgz:
-        cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-                zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zutil.h zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: zutil.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzio.o: zutil.h zlib.h zconf.h
-infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h infblock.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h