diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 20:11:37 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 20:18:50 -0800 |
commit | ec346f1c39aa5569ec899d65ee5bba67a09ae2fc (patch) | |
tree | 3a44a36f2235d384b3b5a95ea06f1da17c94693f | |
parent | 61a56bcbb0561e5c9a9a93af51d43e6a495b468f (diff) | |
download | zlib-ec346f1c39aa5569ec899d65ee5bba67a09ae2fc.tar.gz zlib-ec346f1c39aa5569ec899d65ee5bba67a09ae2fc.tar.bz2 zlib-ec346f1c39aa5569ec899d65ee5bba67a09ae2fc.zip |
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.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.in | 22 |
2 files changed, 12 insertions, 11 deletions
@@ -13,6 +13,7 @@ | |||
13 | *.gcno | 13 | *.gcno |
14 | *.gcov | 14 | *.gcov |
15 | 15 | ||
16 | zconf.h | ||
16 | /example | 17 | /example |
17 | /example64 | 18 | /example64 |
18 | /examplesh | 19 | /examplesh |
diff --git a/Makefile.in b/Makefile.in index 5da4ace..e86777f 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -355,15 +355,15 @@ docs: zlib.3.pdf | |||
355 | zlib.3.pdf: $(SRCDIR)zlib.3 | 355 | zlib.3.pdf: $(SRCDIR)zlib.3 |
356 | groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@ | 356 | groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@ |
357 | 357 | ||
358 | zconf.h.cmakein: $(SRCDIR)zconf.h.in | 358 | # zconf.h.cmakein: $(SRCDIR)zconf.h.in |
359 | -@ TEMPFILE=zconfh_$$; \ | 359 | # -@ TEMPFILE=zconfh_$$; \ |
360 | echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\ | 360 | # echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\ |
361 | sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\ | 361 | # sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\ |
362 | touch -r $(SRCDIR)zconf.h.in $@ &&\ | 362 | # touch -r $(SRCDIR)zconf.h.in $@ &&\ |
363 | rm $$TEMPFILE | 363 | # rm $$TEMPFILE |
364 | 364 | # | |
365 | zconf: $(SRCDIR)zconf.h.in | 365 | # zconf: $(SRCDIR)zconf.h.in |
366 | cp -p $(SRCDIR)zconf.h.in zconf.h | 366 | # cp -p $(SRCDIR)zconf.h.in zconf.h |
367 | 367 | ||
368 | minizip-test: static | 368 | minizip-test: static |
369 | cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; } | 369 | cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; } |
@@ -384,8 +384,8 @@ clean: minizip-clean | |||
384 | rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov | 384 | rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov |
385 | 385 | ||
386 | maintainer-clean: distclean | 386 | maintainer-clean: distclean |
387 | distclean: clean zconf zconf.h.cmakein | 387 | distclean: clean # zconf zconf.h.cmakein |
388 | rm -f Makefile zlib.pc configure.log | 388 | rm -f Makefile zlib.pc configure.log zconf.h |
389 | -@rm -f .DS_Store | 389 | -@rm -f .DS_Store |
390 | @if [ -f Makefile.in ]; then \ | 390 | @if [ -f Makefile.in ]; then \ |
391 | printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \ | 391 | printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \ |