zlib 1.2.3.7v1.2.3.7

1 files changed, 49 insertions, 62 deletions

diff --git a/Makefile.in b/Makefile.in
index 9b81f23..99945a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.3.6
+SHAREDLIBV=libz.so.1.2.3.7
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV)
 
@@ -53,16 +53,15 @@ pkgconfigdir = ${libdir}/pkgconfig
 OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzio.o gzlib.o gzread.o \
         gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
 
-PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzio.lo gzlib.lo gzread.lo \
-        gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo
-
-# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
+# to use the asm code: make OBJA=match.o
 OBJA =
-PIC_OBJA =
 
-OBJS = $(OBJC) $(OBJA)
+objdir = objs/
+picdir = pics/
+
+OBJS = $(addprefix $(objdir), $(OBJC) $(OBJA))
 
-PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
+PIC_OBJS = $(addprefix $(picdir), $(OBJC) $(OBJA))
 
 all: static shared
 
@@ -84,6 +83,7 @@ teststatic: static
         else \
           echo '                *** zlib test FAILED ***'; \
         fi
+        -@rm -f foo.gz
 
 testshared: shared
         @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
@@ -97,6 +97,7 @@ testshared: shared
         else \
           echo '                *** zlib shared test FAILED ***'; \
         fi
+        -@rm -f foo.gz
 
 test64: all64
         @echo hello world | ./minigzip64 | ./minigzip64 -d || \
@@ -106,60 +107,57 @@ test64: all64
         else \
           echo '                *** zlib 64-bit test FAILED ***'; \
         fi
+        -@rm -f foo.gz
 
 libz.a: $(OBJS)
         $(AR) $@ $(OBJS)
         -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
+objs/match.o: match.S
         $(CPP) match.S > _match.s
-        $(CC) -c _match.s
-        mv _match.o match.o
+        $(CC) -c -o $@ _match.s
         rm -f _match.s
 
-match.lo: match.S
+pics/match.o: match.S
         $(CPP) match.S > _match.s
-        $(CC) -c -fPIC _match.s
-        mv _match.o match.lo
+        $(CC) -c -o $@ -fPIC _match.s
         rm -f _match.s
 
-example64.o: example.c zlib.h zconf.h zlibdefs.h
+objs/example64.o: example.c zlib.h zconf.h
         $(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ example.c
 
-minigzip64.o: minigzip.c zlib.h zconf.h zlibdefs.h
+objs/minigzip64.o: minigzip.c zlib.h zconf.h
         $(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ minigzip.c
 
-.SUFFIXES: .lo
+$(objdir)%.o: %.c
+        $(CC) $(CFLAGS) -c -o $@ $<
 
-.c.lo:
-        -@if [ ! -d objs ]; then mkdir objs; fi
-        $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
-        -@mv objs/$*.o $@
+$(picdir)%.o: %.c
+        $(CC) $(SFLAGS) -DPIC -c -o $@ $<
 
 $(SHAREDLIBV): $(PIC_OBJS)
         $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc
         rm -f $(SHAREDLIB) $(SHAREDLIBM)
         ln -s $@ $(SHAREDLIB)
         ln -s $@ $(SHAREDLIBM)
-        -@rmdir objs
 
-example$(EXE): example.o $(STATICLIB)
-        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+example$(EXE): objs/example.o $(STATICLIB)
+        $(CC) $(CFLAGS) -o $@ objs/example.o $(LDFLAGS)
 
-minigzip$(EXE): minigzip.o $(STATICLIB)
-        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+minigzip$(EXE): objs/minigzip.o $(STATICLIB)
+        $(CC) $(CFLAGS) -o $@ objs/minigzip.o $(LDFLAGS)
 
-examplesh$(EXE): example.o $(SHAREDLIBV)
-        $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
+examplesh$(EXE): objs/example.o $(SHAREDLIBV)
+        $(CC) $(CFLAGS) -o $@ objs/example.o -L. $(SHAREDLIBV)
 
-minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
-        $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
+minigzipsh$(EXE): objs/minigzip.o $(SHAREDLIBV)
+        $(CC) $(CFLAGS) -o $@ objs/minigzip.o -L. $(SHAREDLIBV)
 
-example64$(EXE): example64.o $(STATICLIB)
-        $(CC) $(CFLAGS) -o $@ example64.o $(LDFLAGS)
+example64$(EXE): objs/example64.o $(STATICLIB)
+        $(CC) $(CFLAGS) -o $@ objs/example64.o $(LDFLAGS)
 
-minigzip64$(EXE): minigzip64.o $(STATICLIB)
-        $(CC) $(CFLAGS) -o $@ minigzip64.o $(LDFLAGS)
+minigzip64$(EXE): objs/minigzip64.o $(STATICLIB)
+        $(CC) $(CFLAGS) -o $@ objs/minigzip64.o $(LDFLAGS)
 
 install-libs: $(LIBS)
         -@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
@@ -167,7 +165,7 @@ install-libs: $(LIBS)
         -@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
         -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
         cp $(LIBS) $(DESTDIR)$(libdir)
-        cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
+        cd $(DESTDIR)$(libdir); chmod 755 $(SHAREDLIB) ; chmod u=rw,go=r $(STATICLIB)
         -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
         cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
           rm -f $(SHAREDLIB) $(SHAREDLIBM); \
@@ -184,11 +182,11 @@ install-libs: $(LIBS)
 
 install: install-libs
         -@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
-        cp zlib.h zconf.h zlibdefs.h $(DESTDIR)$(includedir)
-        chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zlibdefs.h
+        cp zlib.h zconf.h $(DESTDIR)$(includedir)
+        chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
 
 uninstall:
-        cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zlibdefs.h
+        cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
         cd $(DESTDIR)$(libdir); rm -f libz.a; \
         if test -f $(SHAREDLIBV); then \
           rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
@@ -198,19 +196,18 @@ uninstall:
 
 mostlyclean: clean
 clean:
-        rm -f *.o *.lo *~ \
+        rm -f $(objdir)* $(picdir)* *~ \
            example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
            example64$(EXE) minigzip64$(EXE) \
            libz.* foo.gz so_locations \
            _match.s maketree contrib/infback9/*.o
-        rm -rf objs
 
 maintainer-clean: distclean
 distclean: clean
-        cp -p Makefile.in Makefile
-        rm zlibdefs.h
-        touch -r configure zlibdefs.h
+        cp -p zconf.in.h zconf.h
         rm -f zlib.pc .DS_Store
+        -@printf 'all:\n\t-@echo "Use ./configure first.  Thank you."\n' > Makefile
+        -@ touch -r Makefile.in Makefile objs pics
 
 tags:
         etags *.[ch]
@@ -220,22 +217,12 @@ depend:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-adler32.o gzio.o zutil.o: zutil.h zlib.h zconf.h zlibdefs.h
-gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h zlibdefs.h gzguts.h
-compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h zlibdefs.h
-crc32.o: zutil.h zlib.h zconf.h zlibdefs.h crc32.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
-infback.o inflate.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
-trees.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
-
-adler32.lo gzio.lo zutil.lo: zutil.h zlib.h zconf.h zlibdefs.h
-gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h zlibdefs.h gzguts.h
-compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h zlibdefs.h
-crc32.lo: zutil.h zlib.h zconf.h zlibdefs.h crc32.h
-deflate.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
-infback.lo inflate.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
-inftrees.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
-trees.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
+adler32.o gzio.o zutil.o: zutil.h zlib.h zconf.h
+gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
+compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h crc32.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h