merge libpng 1.4.4 to trunk

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

diff --git a/src/png/scripts/makefile.freebsd b/src/png/scripts/makefile.freebsd
index 59f36444f9dcb8fe328c234a073b87eab8ebbf44..c0014afbda2d5f84c0bd2d3f782108f800f9343e 100644 (file)
--- a/src/png/scripts/makefile.freebsd
+++ b/src/png/scripts/makefile.freebsd
@@ -1,9 +1,12 @@
 # makefile for libpng under FreeBSD
-# Copyright (C) 2002, 2007 Glenn Randers-Pehrson and Andrey A. Chernov
-# For conditions of distribution and use, see copyright notice in png.h
+# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
 
 PREFIX?=        /usr/local
-SHLIB_VER?=     5
+SHLIB_VER?=     14
 
 LIB=           png
 SHLIB_MAJOR=   ${SHLIB_VER}
@@ -14,7 +17,7 @@ NOOBJ=          YES
 # where make install puts libpng.a and png.h
 DESTDIR=       ${PREFIX}
 LIBDIR=                /lib
-INCS=          png.h pngconf.h
+INCS=          png.h pngconf.h pngpriv.h
 INCSDIR=       /include/libpng
 INCDIR=                ${INCSDIR}              # for 4.x bsd.lib.mk
 MAN=           libpng.3 libpngpf.3 png.5
@@ -25,9 +28,6 @@ LDADD+=         -lm -lz
 DPADD+=         ${LIBM} ${LIBZ}
 
 CFLAGS+= -I.
-.if (${MACHINE_ARCH} != "i386")
-CFLAGS+= -DPNG_NO_MMX_CODE
-.endif
 
 SRCS=  png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \