diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-05-09 22:59:08 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-05-09 22:59:08 -0500 |
commit | 9dba7219a04213b2a98a95752fe70b4ec559a624 (patch) | |
tree | e4dfb25061c359b25dc17347f87c57b4a184f467 | |
parent | 17c6af8c40271e4d143dec8dff03384b7f09217f (diff) | |
download | libpng-9dba7219a04213b2a98a95752fe70b4ec559a624.tar.gz |
[libpng17] Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the
right zlib header files.
-rw-r--r-- | ANNOUNCE | 6 | ||||
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | contrib/pngminim/decoder/makefile | 9 | ||||
-rw-r--r-- | contrib/pngminim/encoder/makefile | 9 | ||||
-rw-r--r-- | contrib/pngminim/preader/makefile | 9 |
5 files changed, 22 insertions, 15 deletions
@@ -1,5 +1,5 @@ -Libpng 1.7.0beta13 - May 7, 2013 +Libpng 1.7.0beta13 - 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. @@ -275,9 +275,11 @@ Version 1.7.0beta12 [April 30, 2013] Avoid dereferencing NULL pointer possibly returned from png_create_write_struct() (Andrew Church). -Version 1.7.0beta13 [May 7, 2013] +Version 1.7.0beta13 [May 10, 2013] Check for EOF in contrib/pngminus/pnm2png.c (Paul Stewart). Ignore "#" delimited comments in input file to pnm2png.c. + Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the + right zlib header files. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -4563,9 +4563,11 @@ Version 1.7.0beta12 [April 30, 2013] Avoid dereferencing NULL pointer possibly returned from png_create_write_struct() (Andrew Church). -Version 1.7.0beta13 [May 7, 2013] +Version 1.7.0beta13 [May 10, 2013] Check for EOF in contrib/pngminus/pnm2png.c (Paul Stewart). Ignore "#" delimited comments in input file to pnm2png.c. + Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the + right zlib header files. 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 dafba64b7..25e2ee0c9 100644 --- a/contrib/pngminim/decoder/makefile +++ b/contrib/pngminim/decoder/makefile @@ -14,7 +14,8 @@ LD=$(CC) 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 @@ OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) # note: dependencies do not work on implicit rule lines .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) $(CPPFLAGS) -c $(CFLAGS) $< # dependencies @@ -95,12 +96,12 @@ pngm2pnm$(E): $(OBJS) # 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 810b8c8fa..e2ccbbc28 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile @@ -14,7 +14,8 @@ LD=$(CC) 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 @@ OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) $(CPPFLAGS) -c $(CFLAGS) $< # dependencies @@ -94,12 +95,12 @@ pnm2pngm$(E): $(OBJS) # 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 ecc05c7bf..e9bb303e8 100644 --- a/contrib/pngminim/preader/makefile +++ b/contrib/pngminim/preader/makefile @@ -30,7 +30,8 @@ XLIB = -L/usr/X11R6/lib -lX11 #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 @@ OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) $(CPPFLAGS) -c $(CFLAGS) $< # dependencies @@ -110,12 +111,12 @@ rpng2-x$(E): $(OBJS) # 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: |