Skip to content

Commit

Permalink
Restore zconf.h to distribution.
Browse files Browse the repository at this point in the history
  • Loading branch information
madler committed Feb 6, 2025
1 parent ed16107 commit c715ad7
Show file tree
Hide file tree
Showing 3 changed files with 551 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
*.gcno
*.gcov

zconf.h
/zconf.h
/Makefile
/example
/example64
/examplesh
Expand Down
9 changes: 5 additions & 4 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,9 @@ zlib.3.pdf: $(SRCDIR)zlib.3
# touch -r $(SRCDIR)zconf.h.in $@ &&\
# rm $$TEMPFILE
#
# zconf: $(SRCDIR)zconf.h.in
# cp -p $(SRCDIR)zconf.h.in zconf.h

zconf: $(SRCDIR)zconf.h.in
cp -p $(SRCDIR)zconf.h.in zconf.h

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

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

0 comments on commit c715ad7

Please sign in to comment.