Never overflow the output buffer in wxBase64Decode().

[wxWidgets.git] / src / png / scripts / makefile.elf

diff --git a/src/png/scripts/makefile.elf b/src/png/scripts/makefile.elf
index aa42c1adf8c759baea2284114e78f522abaff942..940ff5872a8e3ea142a4ee23c11cae50a2c67055 100644 (file)
--- a/src/png/scripts/makefile.elf
+++ b/src/png/scripts/makefile.elf
@@ -1,5 +1,6 @@
 # makefile for libpng.a and libpng12.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006 Greg Roelofs and Glenn Randers-Pehrson
+# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs
+# and Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 # For conditions of distribution and use, see copyright notice in png.h
 
@@ -12,7 +13,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.20
+PNGMIN = 1.2.34
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:
@@ -53,7 +54,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 
-CFLAGS=-Wall -D_REENTRANT -O2 \
+CFLAGS=-W -Wall -D_REENTRANT -O2 \
        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 
 LDFLAGS=-L. -lpng12
@@ -99,7 +100,11 @@ libpng.a: $(OBJS)
        $(RANLIB) $@
 
 libpng.pc:
-       cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
+       cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
+       -e s!@exec_prefix@!$(exec_prefix)! \
+       -e s!@libdir@!$(LIBPATH)! \
+       -e s!@includedir@!$(INCPATH)! \
+       -e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
 
 libpng.syms: png.h pngconf.h
        $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\