diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-08-02 10:20:52 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-08-02 10:20:52 -0500 |
commit | 0188ecfb8fce0c3729ada13a591cf345627c975e (patch) | |
tree | 1c2aa26488bde5e987a9796e63ab971dfe242be0 | |
parent | 5c026a3d59adbc08e7a5939a4dd956fad709a6b9 (diff) | |
download | libpng-0188ecfb8fce0c3729ada13a591cf345627c975e.tar.gz |
[libpng15] Merge contrib/pngminim/*/makefile with those from libpng-1.6.24
-rw-r--r-- | ANNOUNCE | 5 | ||||
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | contrib/pngminim/decoder/makefile | 6 | ||||
-rw-r--r-- | contrib/pngminim/encoder/makefile | 6 | ||||
-rw-r--r-- | contrib/pngminim/preader/makefile | 6 |
5 files changed, 14 insertions, 12 deletions
@@ -1,5 +1,5 @@ -Libpng 1.5.28beta01 - July 2, 2016 +Libpng 1.5.28beta01 - August 2, 2016 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. @@ -26,11 +26,12 @@ Other information: Changes since the last public release (1.5.27): -version 1.5.28beta01 [July 2, 2016] +version 1.5.28beta01 [August 2, 2016] Merge with current libpng16 pngvalid.c Fixed undefined behavior in png_push_save_buffer(). Do not call memcpy() with a null source, even if count is zero (Leon Scroggins III). Added "Common linking failures" section to INSTALL. + Merge contrib/pngminim/*/makefile with libpng-1.6.24 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -4496,11 +4496,12 @@ version 1.5.27rc01 [May 14, 2016] version 1.5.27 [May 26, 2016] No changes. -version 1.5.28beta01 [July 2, 2016] +version 1.5.28beta01 [August 2, 2016] Merge with current libpng16 pngvalid.c Fixed undefined behavior in png_push_save_buffer(). Do not call memcpy() with a null source, even if count is zero (Leon Scroggins III). Added "Common linking failures" section to INSTALL. + Merge contrib/pngminim/*/makefile with libpng-1.6.24 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 9d1bde7f1..4acf3c177 100644 --- a/contrib/pngminim/decoder/makefile +++ b/contrib/pngminim/decoder/makefile @@ -82,7 +82,7 @@ OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) # note: dependencies do not work on implicit rule lines .c$(O): - $(CC) $(CPPFLAGS) -c $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< # dependencies @@ -100,12 +100,12 @@ $(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\ + $(MAKE) -f $(PNGSRC)/scripts/pnglibconf.mak $(MAKEFLAGS)\ srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\ DFA_XTRA="pngusr.dfa" $@ clean: - $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ + $(MAKE) -f $(PNGSRC)/scripts/pnglibconf.mak $(MAKEFLAGS)\ srcdir=$(PNGSRC) clean $(RM) pngm2pnm$(O) $(RM) pngm2pnm$(E) diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile index 9686cd78a..41b205c28 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile @@ -81,7 +81,7 @@ OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) $(CPPFLAGS) -c $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< # dependencies @@ -99,12 +99,12 @@ $(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\ + $(MAKE) -f $(PNGSRC)/scripts/pnglibconf.mak $(MAKEFLAGS)\ srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\ DFA_XTRA="pngusr.dfa" $@ clean: - $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ + $(MAKE) -f $(PNGSRC)/scripts/pnglibconf.mak $(MAKEFLAGS)\ srcdir=$(PNGSRC) clean $(RM) pnm2pngm$(O) $(RM) pnm2pngm$(E) diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile index 247fa9f01..b62519911 100644 --- a/contrib/pngminim/preader/makefile +++ b/contrib/pngminim/preader/makefile @@ -97,7 +97,7 @@ OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) $(CPPFLAGS) -c $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< # dependencies @@ -115,12 +115,12 @@ $(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\ + $(MAKE) -f $(PNGSRC)/scripts/pnglibconf.mak $(MAKEFLAGS)\ srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG -I."\ DFA_XTRA="pngusr.dfa" $@ clean: - $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ + $(MAKE) -f $(PNGSRC)/scripts/pnglibconf.mak $(MAKEFLAGS)\ srcdir=$(PNGSRC) clean $(RM) rpng2-x$(O) $(RM) rpng2-x$(E) |