Skip to content

Commit ec346f1

Browse files
committed
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.
1 parent 61a56bc commit ec346f1

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*.gcno
1414
*.gcov
1515

16+
zconf.h
1617
/example
1718
/example64
1819
/examplesh

Makefile.in

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,15 @@ docs: zlib.3.pdf
355355
zlib.3.pdf: $(SRCDIR)zlib.3
356356
groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
357357

358-
zconf.h.cmakein: $(SRCDIR)zconf.h.in
359-
-@ TEMPFILE=zconfh_$$; \
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 > $@ &&\
362-
touch -r $(SRCDIR)zconf.h.in $@ &&\
363-
rm $$TEMPFILE
364-
365-
zconf: $(SRCDIR)zconf.h.in
366-
cp -p $(SRCDIR)zconf.h.in zconf.h
358+
# zconf.h.cmakein: $(SRCDIR)zconf.h.in
359+
# -@ TEMPFILE=zconfh_$$; \
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 > $@ &&\
362+
# touch -r $(SRCDIR)zconf.h.in $@ &&\
363+
# rm $$TEMPFILE
364+
#
365+
# zconf: $(SRCDIR)zconf.h.in
366+
# cp -p $(SRCDIR)zconf.h.in zconf.h
367367

368368
minizip-test: static
369369
cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
@@ -384,8 +384,8 @@ clean: minizip-clean
384384
rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
385385

386386
maintainer-clean: distclean
387-
distclean: clean zconf zconf.h.cmakein
388-
rm -f Makefile zlib.pc configure.log
387+
distclean: clean # zconf zconf.h.cmakein
388+
rm -f Makefile zlib.pc configure.log zconf.h
389389
-@rm -f .DS_Store
390390
@if [ -f Makefile.in ]; then \
391391
printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \

0 commit comments

Comments
 (0)