From b0baee5e36653bc0dca7cfc78bb0c3a6f8ac8639 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 21 Feb 2010 23:12:32 -0600 Subject: [PATCH] [master] Removed unused gzio.c from contrib/pngminim gather and makefile scripts. This is necessary when libz is updated to version 1.2.4. --- ANNOUNCE | 7 +++++-- CHANGES | 5 ++++- contrib/pngminim/decoder/gather.sh | 2 +- contrib/pngminim/decoder/makefile | 2 +- contrib/pngminim/encoder/gather.sh | 2 +- contrib/pngminim/encoder/makefile | 2 +- contrib/pngminim/preader/gather.sh | 2 +- contrib/pngminim/preader/makefile | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index a2da5fb0a..5fd9e90c9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.1rc04 - February 20, 2010 +Libpng 1.4.1rc04 - February 22, 2010 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -89,13 +89,16 @@ version 1.4.1beta12 [February 14, 2010] version 1.4.1rc02 [February 18, 2010] No changes. -version 1.4.1rc03 [February 20, 2010] +version 1.4.1rc03 [February 19, 2010] Noted in scripts/makefile.mingw that it expects to be run under MSYS. Removed obsolete unused MMX-querying support from contrib/gregbook Removed the AIX redefinition of jmpbuf in png.h Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt when using AIX compiler. +version 1.4.1rc04 [February 22, 2010] + Removed unused gzio.c from contrib/pngminim gather and makefile scripts + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index 1c6d48be8..5d1de71be 100644 --- a/CHANGES +++ b/CHANGES @@ -2522,13 +2522,16 @@ version 1.4.1beta12 [February 14, 2010] version 1.4.1rc02 [January 18, 2010] No changes. -version 1.4.1rc03 [February 20, 2010] +version 1.4.1rc03 [February 19, 2010] Noted in scripts/makefile.mingw that it expects to be run under MSYS. Removed obsolete unused MMX-querying support from contrib/gregbook Removed the AIX redefinition of jmpbuf in png.h Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt when using AIX compiler. +version 1.4.1rc04 [February 22, 2010] + Removed unused gzio.c from contrib/pngminim gather and makefile scripts + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/contrib/pngminim/decoder/gather.sh b/contrib/pngminim/decoder/gather.sh index e66616ee3..264564deb 100755 --- a/contrib/pngminim/decoder/gather.sh +++ b/contrib/pngminim/decoder/gather.sh @@ -5,4 +5,4 @@ rm example.c pngtest.c pngpread.c pngw*.c # change the following 2 lines if zlib is somewhere else cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . -rm minigzip.c example.c compress.c deflate.c +rm minigzip.c example.c compress.c deflate.c gz* diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile index 2858f9c90..1c8712f87 100644 --- a/contrib/pngminim/decoder/makefile +++ b/contrib/pngminim/decoder/makefile @@ -15,7 +15,7 @@ O=.o L=.a E= -ZOBJS = adler32$(O) crc32$(O) gzio$(O) \ +ZOBJS = adler32$(O) crc32$(O) \ infback$(O) inffast$(O) inflate$(O) inftrees$(O) \ trees$(O) uncompr$(O) zutil$(O) diff --git a/contrib/pngminim/encoder/gather.sh b/contrib/pngminim/encoder/gather.sh index 8e6cadd15..d79cd2b85 100755 --- a/contrib/pngminim/encoder/gather.sh +++ b/contrib/pngminim/encoder/gather.sh @@ -6,4 +6,4 @@ rm example.c pngtest.c pngr*.c pngpread.c cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . rm inf*.[ch] -rm minigzip.c example.c +rm minigzip.c example.c gz* diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile index 8f05e8d95..31caff289 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile @@ -14,7 +14,7 @@ O=.o L=.a E= -ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) gzio$(O) \ +ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \ dummy_inflate$(O) \ trees$(O) uncompr$(O) zutil$(O) diff --git a/contrib/pngminim/preader/gather.sh b/contrib/pngminim/preader/gather.sh index 8196e91aa..4fe4231bc 100755 --- a/contrib/pngminim/preader/gather.sh +++ b/contrib/pngminim/preader/gather.sh @@ -6,4 +6,4 @@ rm example.c pngtest.c pngw*.c # change the following 2 lines if zlib is somewhere else cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . -rm minigzip.c example.c compress.c deflate.c +rm minigzip.c example.c compress.c deflate.c gz* diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile index 46dd93d00..72911bb8d 100644 --- a/contrib/pngminim/preader/makefile +++ b/contrib/pngminim/preader/makefile @@ -31,7 +31,7 @@ O=.o L=.a E= -ZOBJS = adler32$(O) crc32$(O) gzio$(O) \ +ZOBJS = adler32$(O) crc32$(O) \ infback$(O) inffast$(O) inflate$(O) inftrees$(O) \ trees$(O) uncompr$(O) zutil$(O)