Merge libpng 1.6.2 into the trunk.

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

diff --git a/src/png/scripts/makefile.ne12bsd b/src/png/scripts/makefile.ne12bsd
index bf6ac2d6217e2d99d2e77535ad4d2314882fb133..086decf1a14be2f6fa49fa385e97ff7ad1c33da1 100644 (file)
--- a/src/png/scripts/makefile.ne12bsd
+++ b/src/png/scripts/makefile.ne12bsd
@@ -13,15 +13,15 @@
 LOCALBASE?=/usr/local
 LIBDIR=        ${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man
-INCSDIR=${LOCALBASE}/include/libpng14
+INCSDIR=${LOCALBASE}/include/libpng16
 
-LIB=   png14
+LIB=   png16
 SHLIB_MAJOR=   0
-SHLIB_MINOR=   1.4.4
+SHLIB_MINOR=   1.6.2
 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
-INCS=  png.h pngconf.h
+INCS=  png.h pngconf.h pnglibconf.h
 MAN=   libpng.3 libpngpf.3 png.5
 
 CPPFLAGS+=-I${.CURDIR}
@@ -32,7 +32,11 @@ CPPFLAGS+=-I${.CURDIR}
 #   MKLINT= no
 # .endif
 
-CLEANFILES+=pngtest.o pngtest
+CLEANFILES+=pngtest.o pngtest pnglibconf.h
+
+# see scripts/pnglibconf.mak for more options
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+       cp scripts/pnglibconf.h.prebuilt $@
 
 pngtest.o:     pngtest.c
        ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}