aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/makefile.elf
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-09 11:52:12 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-09 11:52:12 -0700
commit4215dd1533c56e1a89ae6f1d6ea68677fac27fda (patch)
tree99318267166103602095f7af976be5b7f0e25d04 /scripts/makefile.elf
parent893912bfc2683463dc3e2c445336752d012563d3 (diff)
downloadexternal_libpng-4215dd1533c56e1a89ae6f1d6ea68677fac27fda.zip
external_libpng-4215dd1533c56e1a89ae6f1d6ea68677fac27fda.tar.gz
external_libpng-4215dd1533c56e1a89ae6f1d6ea68677fac27fda.tar.bz2
auto import from //branches/cupcake/...@137197
Diffstat (limited to 'scripts/makefile.elf')
-rw-r--r--scripts/makefile.elf7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 1c1a8e9..6da6af5 100644
--- a/scripts/makefile.elf
+++ b/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.29
+PNGMIN = 1.2.35
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