Change version number to 1.2.7.3.

[zlib.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c1c37fed9bc1d793dda0716f46e49fa77cf5b53f..351389a603bf880ea1552861b7995e5a10163775 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for zlib
-# Copyright (C) 1995-2011 Jean-loup Gailly.
+# Copyright (C) 1995-2012 Jean-loup Gailly, Mark Adler
 # For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile and test, type:
@@ -32,11 +32,12 @@ CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.5.2
+SHAREDLIBV=libz.so.1.2.7.3
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
-AR=ar rc
+AR=ar
+ARFLAGS=rc
 RANLIB=ranlib
 LDCONFIG=ldconfig
 LDSHAREDLIBC=-lc
@@ -52,7 +53,6 @@ includedir = ${prefix}/include
 mandir = ${prefix}/share/man
 man3dir = ${mandir}/man3
 pkgconfigdir = ${libdir}/pkgconfig
-tempfile := $(shell mktemp -u __XXXXXX)
 
 OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
@@ -83,35 +83,49 @@ check: test
 test: all teststatic testshared
 
 teststatic: static
-       @if echo hello world | ./minigzip | ./minigzip -d && ./example; then \
+       @TMPST=tmpst_$$; \
+       if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
          echo '                *** zlib test OK ***'; \
        else \
          echo '                *** zlib test FAILED ***'; false; \
-       fi
-       -@rm -f foo.gz
+       fi; \
+       rm -f $$TMPST
 
 testshared: shared
        @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
        LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
        DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
        SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
-       if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh; then \
+       TMPSH=tmpsh_$$; \
+       if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
          echo '                *** zlib shared test OK ***'; \
        else \
          echo '                *** zlib shared test FAILED ***'; false; \
-       fi
-       -@rm -f foo.gz
+       fi; \
+       rm -f $$TMPSH
 
 test64: all64
-       @if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64; then \
+       @TMP64=tmp64_$$; \
+       if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
          echo '                *** zlib 64-bit test OK ***'; \
        else \
          echo '                *** zlib 64-bit test FAILED ***'; false; \
-       fi
-       -@rm -f foo.gz
+       fi; \
+       rm -f $$TMP64
+
+infcover.o: test/infcover.c zlib.h zconf.h
+       $(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c
+
+infcover: infcover.o libz.a
+       $(CC) $(CFLAGS) -o $@ infcover.o libz.a
+
+cover: infcover
+       rm -f *.gcda
+       ./infcover
+       gcov inf*.c
 
 libz.a: $(OBJS)
-       $(AR) $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
 match.o: match.S
@@ -126,11 +140,17 @@ match.lo: match.S
        mv _match.o match.lo
        rm -f _match.s
 
-example64.o: example.c zlib.h zconf.h
-       $(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ example.c
+example.o: test/example.c zlib.h zconf.h
+       $(CC) $(CFLAGS) -I. -c -o $@ test/example.c
+
+minigzip.o: test/minigzip.c zlib.h zconf.h
+       $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
+
+example64.o: test/example.c zlib.h zconf.h
+       $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c
 
-minigzip64.o: minigzip.c zlib.h zconf.h
-       $(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ minigzip.c
+minigzip64.o: test/minigzip.c zlib.h zconf.h
+       $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c
 
 .SUFFIXES: .lo
 
@@ -196,13 +216,13 @@ install: install-libs
        chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
 
 uninstall:
-       cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
-       cd $(DESTDIR)$(libdir); rm -f libz.a; \
+       cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
+       cd $(DESTDIR)$(libdir) && rm -f libz.a; \
        if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
          rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
        fi
-       cd $(DESTDIR)$(man3dir); rm -f zlib.3
-       cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
+       cd $(DESTDIR)$(man3dir) && rm -f zlib.3
+       cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
 
 docs: zlib.3.pdf
 
@@ -210,10 +230,11 @@ zlib.3.pdf: zlib.3
        groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf
 
 zconf.h.cmakein: zconf.h.in
-       -@echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" > $(tempfile)
-       -@sed -f $(tempfile) zconf.h.in > zconf.h.cmakein
-       -@touch -r zconf.h.in zconf.h.cmakein
-       -@rm $(tempfile)
+       -@ TEMPFILE=zconfh_$$; \
+       echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
+       sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\
+       touch -r zconf.h.in zconf.h.cmakein &&\
+       rm $$TEMPFILE
 
 zconf: zconf.h.in
        cp -p zconf.h.in zconf.h
@@ -223,13 +244,16 @@ clean:
        rm -f *.o *.lo *~ \
           example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
           example64$(EXE) minigzip64$(EXE) \
+          infcover \
           libz.* foo.gz so_locations \
           _match.s maketree contrib/infback9/*.o
        rm -rf objs
+       rm -f *.gcda *.gcno *.gcov
+       rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
 
 maintainer-clean: distclean
 distclean: clean zconf zconf.h.cmakein docs
-       rm -f Makefile zlib.pc
+       rm -f Makefile zlib.pc configure.log
        -@rm -f .DS_Store
        -@printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile
        -@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile