[libpng16] Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the right zlib headers.
diff --git a/ANNOUNCE b/ANNOUNCE index f729d74..bce14fb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE
@@ -1,5 +1,5 @@ -Libpng 1.6.3beta06 - May 9, 2013 +Libpng 1.6.3beta06 - May 10, 2013 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. @@ -69,7 +69,12 @@ Added information in the documentation about problems with and fixes for the bad CRC and bad iTXt chunk situations. -Version 1.6.3beta06 [May 9, 2013] +Version 1.6.3beta06 [May 10, 2013] + Allow contrib/pnminus/pnm2png.c to compile without WRITE_INVERT and WRITE_PACK + supported (writes error message that it can't read P1 or P4 PBM files). + Improved png-fix-too-far-back usage message, added --suffix option. + Revised contrib/pngminim/*/makefile to generated pnglibconf.h with the + right ZLIB_VERNUM. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES index e8fcb9f..c40c6fa 100644 --- a/CHANGES +++ b/CHANGES
@@ -4552,7 +4552,12 @@ Added information in the documentation about problems with and fixes for the bad CRC and bad iTXt chunk situations. -Version 1.6.3beta06 [May 9, 2013] +Version 1.6.3beta06 [May 10, 2013] + Allow contrib/pnminus/pnm2png.c to compile without WRITE_INVERT and WRITE_PACK + supported (writes error message that it can't read P1 or P4 PBM files). + Improved png-fix-too-far-back usage message, added --suffix option. + Revised contrib/pngminim/*/makefile to generated pnglibconf.h with the + right ZLIB_VERNUM. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile index dafba64..25e2ee0 100644 --- a/contrib/pngminim/decoder/makefile +++ b/contrib/pngminim/decoder/makefile
@@ -14,7 +14,8 @@ RM=rm -f COPY=cp -CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP -I. -O1 +CPPFLAGS=-I. -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP +CFLAGS=-O1 C=.c O=.o @@ -81,7 +82,7 @@ # note: dependencies do not work on implicit rule lines .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) $(CPPFLAGS) -c $(CFLAGS) $< # dependencies @@ -95,12 +96,12 @@ # The CPP_FLAGS setting causes pngusr.h to be included in # both the build of pnglibconf.h and, subsequently, when # building libpng itself. -$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\ +$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak $(ZH)\ $(PNGSRC)/scripts/pnglibconf.dfa \ $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa $(RM) pnglibconf.h pnglibconf.dfn $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ - srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\ + srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\ DFA_XTRA="pngusr.dfa" $@ clean:
diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile index 810b8c8..e2ccbbc 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile
@@ -14,7 +14,8 @@ RM=rm -f COPY=cp -CFLAGS=-DPNG_USER_CONFIG -DZ_SOLO -DNO_GZIP -I. -O1 +CPPFLAGS=-I. -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP +CFLAGS=-O1 C=.c O=.o @@ -80,7 +81,7 @@ # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) $(CPPFLAGS) -c $(CFLAGS) $< # dependencies @@ -94,12 +95,12 @@ # The CPP_FLAGS setting causes pngusr.h to be included in # both the build of pnglibconf.h and, subsequently, when # building libpng itself. -$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\ +$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak $(ZH)\ $(PNGSRC)/scripts/pnglibconf.dfa \ $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa $(RM) pnglibconf.h pnglibconf.dfn $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ - srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\ + srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\ DFA_XTRA="pngusr.dfa" $@ clean:
diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile index ecc05c7..e9bb303 100644 --- a/contrib/pngminim/preader/makefile +++ b/contrib/pngminim/preader/makefile
@@ -30,7 +30,8 @@ #LIBS = $(XLIB) LIBS = $(XLIB) -lm #platforms that need libm -CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP -I. $(XINC) -O1 +CPPFLAGS=-I. $(XINC) -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DZ_SOLO -DNO_GZIP +CFLAGS=-O1 C=.c O=.o @@ -96,7 +97,7 @@ # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) $(CPPFLAGS) -c $(CFLAGS) $< # dependencies @@ -110,12 +111,12 @@ # The CPP_FLAGS setting causes pngusr.h to be included in # both the build of pnglibconf.h and, subsequently, when # building libpng itself. -$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\ +$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak $(ZH)\ $(PNGSRC)/scripts/pnglibconf.dfa \ $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa $(RM) pnglibconf.h pnglibconf.dfn $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ - srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\ + srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\ DFA_XTRA="pngusr.dfa" $@ clean: