summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-12-11 07:26:31 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-12-11 07:26:31 -0600
commitf174f270964bfd9fac6e18547920842190bf3ca9 (patch)
tree90b6146f59aa68f0b3fcdde5cd880b901eab0c6a
parent1a15762c597169e5ebc04d2e97b968acd2fd91a3 (diff)
downloadlibpng-f174f270964bfd9fac6e18547920842190bf3ca9.tar.gz
[master] Removed leftover "-DPNG_CONFIGURE_LIBPNG"
from contrib/pngminim/*/makefile
-rw-r--r--ANNOUNCE5
-rw-r--r--CHANGES1
-rw-r--r--contrib/pngminim/decoder/makefile2
-rw-r--r--contrib/pngminim/encoder/makefile2
-rw-r--r--contrib/pngminim/preader/makefile2
5 files changed, 7 insertions, 5 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index f43437ecc..c3dc6a93d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -48,11 +48,12 @@ version 1.2.42beta01 [December 4, 2009]
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
- to put them in $prefix/include/libpng12 instead of in
- $prefix/include/libpng/libpng12.
+ to put them in $prefix/include/libpng%NN% instead of in
+ $prefix/include/libpng/libpng%NN%.
Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin
version 1.2.42beta02 [December 11, 2009]
+ Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/CHANGES b/CHANGES
index 49b9211f8..72ca05410 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2616,6 +2616,7 @@ version 1.2.42beta01 [December 4, 2009]
Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin
version 1.2.42beta02 [December 11, 2009]
+ Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile
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 5f468601e..27e04cbde 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 5e86f8921..1182b5b23 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 2dcb3fddc..74a17a38f 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