diff options
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/Makefile | 156 | ||||
| -rw-r--r-- | zlib/crc32.c | 2 | ||||
| -rw-r--r-- | zlib/deflate.c | 2 | ||||
| -rw-r--r-- | zlib/infback.c | 1 | ||||
| -rw-r--r-- | zlib/inffast.c | 1 | ||||
| -rw-r--r-- | zlib/inflate.c | 2 | ||||
| -rw-r--r-- | zlib/inftrees.c | 1 | ||||
| -rw-r--r-- | zlib/trees.c | 2 | ||||
| -rw-r--r-- | zlib/zutil.c | 2 |
9 files changed, 16 insertions, 153 deletions
diff --git a/zlib/Makefile b/zlib/Makefile index 2fd6e45c4..9fecb13ef 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -1,154 +1,4 @@ -# Makefile for zlib -# Copyright (C) 1995-2005 Jean-loup Gailly. -# For conditions of distribution and use, see copyright notice in zlib.h +LIBRARY=libz +CSRCS = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c trees.c \ + zutil.c inflate.c infback.c inftrees.c inffast.c -# To compile and test, type: -# ./configure; make test -# The call of configure is optional if you don't have special requirements -# If you wish to build zlib as a shared library, use: ./configure -s - -# To use the asm code, type: -# cp contrib/asm?86/match.S ./match.S -# make LOC=-DASMV OBJA=match.o - -# 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=libz.a -LDSHARED=$(CC) -CPP=$(CC) -E - -LIBS=libz.a -SHAREDLIB=libz.so -SHAREDLIBV=libz.so.1.2.3 -SHAREDLIBM=libz.so.1 - -AR=ar rc -RANLIB=ranlib -TAR=tar -SHELL=/bin/sh -EXE= - -prefix = /usr/local -exec_prefix = ${prefix} -libdir = ${exec_prefix}/lib -includedir = ${prefix}/include -mandir = ${prefix}/share/man -man3dir = ${mandir}/man3 - -OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ - zutil.o inflate.o infback.o inftrees.o inffast.o - -OBJA = -# to use the asm code: make OBJA=match.o - -TEST_OBJS = example.o minigzip.o - -all: example$(EXE) minigzip$(EXE) - -check: test -test: all - @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ - echo hello world | ./minigzip | ./minigzip -d || \ - echo ' *** minigzip test FAILED ***' ; \ - if ./example; then \ - echo ' *** zlib test OK ***'; \ - else \ - echo ' *** zlib test FAILED ***'; \ - fi - -libz.a: $(OBJS) $(OBJA) - $(AR) $@ $(OBJS) $(OBJA) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - -match.o: match.S - $(CPP) match.S > _match.s - $(CC) -c _match.s - mv _match.o match.o - rm -f _match.s - -$(SHAREDLIBV): $(OBJS) - $(LDSHARED) -o $@ $(OBJS) - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) - -example$(EXE): example.o $(LIBS) - $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) - -minigzip$(EXE): minigzip.o $(LIBS) - $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) - -install: $(LIBS) - -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi - -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi - -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi - -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi - cp zlib.h zconf.h $(includedir) - chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h - cp $(LIBS) $(libdir) - cd $(libdir); chmod 755 $(LIBS) - -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - cd $(libdir); if test -f $(SHAREDLIBV); then \ - rm -f $(SHAREDLIB) $(SHAREDLIBM); \ - ln -s $(SHAREDLIBV) $(SHAREDLIB); \ - ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ - (ldconfig || true) >/dev/null 2>&1; \ - fi - cp zlib.3 $(man3dir) - chmod 644 $(man3dir)/zlib.3 -# The ranlib in install is needed on NeXTSTEP which checks file times -# ldconfig is for Linux - -uninstall: - cd $(includedir); \ - cd $(libdir); rm -f libz.a; \ - if test -f $(SHAREDLIBV); then \ - rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ - fi - cd $(man3dir); rm -f zlib.3 - -mostlyclean: clean -clean: - rm -f *.o *~ example$(EXE) minigzip$(EXE) \ - libz.* foo.gz so_locations \ - _match.s maketree contrib/infback9/*.o - -maintainer-clean: distclean -distclean: clean - cp -p Makefile.in Makefile - cp -p zconf.in.h zconf.h - rm -f .DS_Store - -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: crc32.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 -inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h -inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h -infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h -inftrees.o: zutil.h zlib.h zconf.h inftrees.h -minigzip.o: zlib.h zconf.h -trees.o: deflate.h zutil.h zlib.h zconf.h trees.h -uncompr.o: zlib.h zconf.h -zutil.o: zutil.h zlib.h zconf.h diff --git a/zlib/crc32.c b/zlib/crc32.c index f658a9ef5..f7eeb8308 100644 --- a/zlib/crc32.c +++ b/zlib/crc32.c @@ -19,6 +19,8 @@ one thread to use crc32(). */ +#include <stdio.h> + #ifdef MAKECRCH # include <stdio.h> # ifndef DYNAMIC_CRC_TABLE diff --git a/zlib/deflate.c b/zlib/deflate.c index 29ce1f64a..531c3e75e 100644 --- a/zlib/deflate.c +++ b/zlib/deflate.c @@ -49,6 +49,8 @@ /* @(#) $Id$ */ +#include <stdio.h> + #include "deflate.h" const char deflate_copyright[] = diff --git a/zlib/infback.c b/zlib/infback.c index 455dbc9ee..70ab5a8d8 100644 --- a/zlib/infback.c +++ b/zlib/infback.c @@ -10,6 +10,7 @@ inflate_fast() can be used with either inflate.c or infback.c. */ +#include <stdio.h> #include "zutil.h" #include "inftrees.h" #include "inflate.h" diff --git a/zlib/inffast.c b/zlib/inffast.c index bbee92ed1..e243ef8e6 100644 --- a/zlib/inffast.c +++ b/zlib/inffast.c @@ -3,6 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ +#include <stdio.h> #include "zutil.h" #include "inftrees.h" #include "inflate.h" diff --git a/zlib/inflate.c b/zlib/inflate.c index 792fdee8e..be1aa7fc8 100644 --- a/zlib/inflate.c +++ b/zlib/inflate.c @@ -80,6 +80,8 @@ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. */ +#include <stdio.h> + #include "zutil.h" #include "inftrees.h" #include "inflate.h" diff --git a/zlib/inftrees.c b/zlib/inftrees.c index 8a9c13ff0..2a67c4cf8 100644 --- a/zlib/inftrees.c +++ b/zlib/inftrees.c @@ -3,6 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ +#include <stdio.h> #include "zutil.h" #include "inftrees.h" diff --git a/zlib/trees.c b/zlib/trees.c index 395e4e168..b5ccd84d4 100644 --- a/zlib/trees.c +++ b/zlib/trees.c @@ -33,6 +33,8 @@ /* #define GEN_TREES_H */ +#include <stdio.h> + #include "deflate.h" #ifdef DEBUG diff --git a/zlib/zutil.c b/zlib/zutil.c index d55f5948a..57f6130e4 100644 --- a/zlib/zutil.c +++ b/zlib/zutil.c @@ -5,6 +5,8 @@ /* @(#) $Id$ */ +#include <stdio.h> + #include "zutil.h" #ifndef NO_DUMMY_DECL |