Update Makefile to not recreate zconf.h and zconf.h.cmakein.

Both were removed as zconf.h.cmakein is no longer needed, and
zconf.h is made from zconf.h.in.
pull/953/merge
Mark Adler 1 week ago
parent 61a56bcbb0
commit ec346f1c39
  1. 1
      .gitignore
  2. 22
      Makefile.in

1
.gitignore vendored

@ -13,6 +13,7 @@
*.gcno *.gcno
*.gcov *.gcov
zconf.h
/example /example
/example64 /example64
/examplesh /examplesh

@ -355,15 +355,15 @@ docs: zlib.3.pdf
zlib.3.pdf: $(SRCDIR)zlib.3 zlib.3.pdf: $(SRCDIR)zlib.3
groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@ groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
zconf.h.cmakein: $(SRCDIR)zconf.h.in # zconf.h.cmakein: $(SRCDIR)zconf.h.in
-@ TEMPFILE=zconfh_$$; \ # -@ TEMPFILE=zconfh_$$; \
echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\ # echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\ # sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
touch -r $(SRCDIR)zconf.h.in $@ &&\ # touch -r $(SRCDIR)zconf.h.in $@ &&\
rm $$TEMPFILE # rm $$TEMPFILE
#
zconf: $(SRCDIR)zconf.h.in # zconf: $(SRCDIR)zconf.h.in
cp -p $(SRCDIR)zconf.h.in zconf.h # cp -p $(SRCDIR)zconf.h.in zconf.h
minizip-test: static minizip-test: static
cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; } cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
@ -384,8 +384,8 @@ clean: minizip-clean
rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
maintainer-clean: distclean maintainer-clean: distclean
distclean: clean zconf zconf.h.cmakein distclean: clean # zconf zconf.h.cmakein
rm -f Makefile zlib.pc configure.log rm -f Makefile zlib.pc configure.log zconf.h
-@rm -f .DS_Store -@rm -f .DS_Store
@if [ -f Makefile.in ]; then \ @if [ -f Makefile.in ]; then \
printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \ printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \

Loading…
Cancel
Save