From 721b062631f664895ea40a503e34ef9641af76b3 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 11 Dec 2009 08:04:41 -0600 Subject: [PATCH] [alpha] Removed "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile --- ANNOUNCE | 6 +++--- CHANGES | 4 ++-- contrib/pngminim/decoder/makefile | 2 +- contrib/pngminim/encoder/makefile | 2 +- contrib/pngminim/preader/makefile | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index bcf87e9bb..9b15902a8 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.1alpha02 - December 4, 2009 +Libpng 1.4.1alpha02 - December 11, 2009 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. @@ -29,7 +29,7 @@ Changes since the last public release (1.4.0beta107): version 1.4.1alpha01 [November 27, 2009] Based on 1.4.0beta107 (prerelease) -version 1.4.1alpha02 [December 4, 2009] +version 1.4.1alpha02 [December 11, 2009] Restored premultiplied alpha feature from version 1.4.0beta105. Added "double gamma" to parameters for png_set_premultiply_alpha(). Added "float postmultiply_gamma" member to the png_struct. @@ -45,7 +45,7 @@ version 1.4.1alpha02 [December 4, 2009] Sync with version 1.4.0beta107: Updated README Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. - Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects. + Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles, projects, and contrib. Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco to put png.h and pngconf.h in $prefix/include, like the other scripts, instead of in $prefix/include/libpng. Also revised makefile.sco diff --git a/CHANGES b/CHANGES index 2b91cf97b..000c84c3a 100644 --- a/CHANGES +++ b/CHANGES @@ -2411,7 +2411,7 @@ version 1.4.0beta107 [November 27, 2009] version 1.4.1alpha01 [November 27, 2009] Based on 1.4.0beta107 (prerelease) -version 1.4.1alpha02 [December 4, 2009] +version 1.4.1alpha02 [December 11, 2009] Restored premultiplied alpha feature from version 1.4.0beta105. Added "double gamma" to parameters for png_set_premultiply_alpha(). Added "float postmultiply_gamma" member to the png_struct. @@ -2427,7 +2427,7 @@ version 1.4.1alpha02 [December 4, 2009] Sync with version 1.4.0beta107: Updated README Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. - Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects. + Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles, projects, and contrib. Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco to put png.h and pngconf.h in $prefix/include, like the other scripts, instead of in $prefix/include/libpng. Also revised makefile.sco diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile index 49b2621b1..2858f9c90 100644 --- a/contrib/pngminim/decoder/makefile +++ b/contrib/pngminim/decoder/makefile @@ -7,7 +7,7 @@ LD=$(CC) RM=rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \ +CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \ -DdeflateParams\(a,b,c\)=Z_OK -I. -O1 C=.c diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile index 2b5054f93..8f05e8d95 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile @@ -7,7 +7,7 @@ LD=$(CC) RM=rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZIP -I. -O1 +CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1 C=.c O=.o diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile index d761d58a0..46dd93d00 100644 --- a/contrib/pngminim/preader/makefile +++ b/contrib/pngminim/preader/makefile @@ -23,7 +23,7 @@ XLIB = -L/usr/X11R6/lib -lX11 #LIBS = $(XLIB) LIBS = $(XLIB) -lm #platforms that need libm -CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \ +CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \ -DdeflateParams\(a,b,c\)=Z_OK -I. $(XINC) -O1 C=.c