Merge in from trunk r64802 - r68625

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

diff --git a/src/png/scripts/makefile.netbsd b/src/png/scripts/makefile.netbsd
index d010c9027ed46bc457ef26c1b6f478fb1792d887..e75378035ccf5b7e6c8aa5c13c3bea770ab714f2 100644 (file)
--- a/src/png/scripts/makefile.netbsd
+++ b/src/png/scripts/makefile.netbsd
@@ -2,19 +2,22 @@
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche

-# Copyright (C) 2007 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+# Copyright (C) 2007-2009 Glenn Randers-Pehrson
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h

 
 

-# You should also run makefile.ne0bsd
+# You should also run makefile.ne14bsd

 
 LOCALBASE?=/usr/local
 LIBDIR=        ${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man
 
 LOCALBASE?=/usr/local
 LIBDIR=        ${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man

-INCSDIR=${LOCALBASE}/include/libpng
+INCSDIR=${LOCALBASE}/include

 
 LIB=   png
 SHLIB_MAJOR=   3
 
 LIB=   png
 SHLIB_MAJOR=   3

-SHLIB_MINOR=   1.2.20
+SHLIB_MINOR=   1.4.4

 SRCS=  png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
        pngwtran.c pngmem.c pngerror.c pngpread.c
 SRCS=  png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
        pngwtran.c pngmem.c pngerror.c pngpread.c


@@ -23,12 +26,10 @@ MAN=        libpng.3 libpngpf.3 png.5
 
 CPPFLAGS+=-I${.CURDIR}
 
 
 CPPFLAGS+=-I${.CURDIR}
 

-# something like this for mmx assembler, but it core dumps for me at the moment
+# We should be able to do something like this instead of the manual
+# uncommenting, but it core dumps for me at the moment:

 # .if ${MACHINE_ARCH} == "i386"
 # .if ${MACHINE_ARCH} == "i386"

-#   CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK

 #   MKLINT= no
 #   MKLINT= no

-# .else
-    CPPFLAGS+=-DPNG_NO_MMX_CODE

 # .endif
 
 CLEANFILES+=pngtest.o pngtest
 # .endif
 
 CLEANFILES+=pngtest.o pngtest