Merge libpng 1.6.2 into the trunk.

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

diff --git a/src/png/scripts/makefile.freebsd b/src/png/scripts/makefile.freebsd
index 994608c993a1cc5e8114b296c7e9b50f8fdd5945..0ddf4ae4aa9e8c9a17cd85109959485c56babfbe 100644 (file)
--- a/src/png/scripts/makefile.freebsd
+++ b/src/png/scripts/makefile.freebsd
@@ -6,18 +6,18 @@
 # and license in png.h
 
 PREFIX?=        /usr/local
 # and license in png.h
 
 PREFIX?=        /usr/local

-SHLIB_VER?=     15
+SHLIB_VER?=     16

 
 LIB=           png
 SHLIB_MAJOR=   ${SHLIB_VER}
 SHLIB_MINOR=   0
 
 LIB=           png
 SHLIB_MAJOR=   ${SHLIB_VER}
 SHLIB_MINOR=   0

-NOPROFILE=     YES
-NOOBJ=          YES
+NO_PROFILE=    YES
+NO_OBJ=          YES

 
 # where make install puts libpng.a and png.h
 DESTDIR=       ${PREFIX}
 LIBDIR=                /lib
 
 # where make install puts libpng.a and png.h
 DESTDIR=       ${PREFIX}
 LIBDIR=                /lib

-INCS=          png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+INCS=          png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h

 INCSDIR=       /include/libpng
 INCDIR=                ${INCSDIR}              # for 4.x bsd.lib.mk
 MAN=           libpng.3 libpngpf.3 png.5
 INCSDIR=       /include/libpng
 INCDIR=                ${INCSDIR}              # for 4.x bsd.lib.mk
 MAN=           libpng.3 libpngpf.3 png.5


@@ -25,17 +25,25 @@ MANDIR=             /man/man
 SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
                libpng/pngconf.h ${INCSDIR}/../pngconf.h \
                libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
 SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
                libpng/pngconf.h ${INCSDIR}/../pngconf.h \
                libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h

-LDADD+=         -lm -lz
+
+# where make install finds libz.a and zlib.h
+ZLIBLIB=       /usr/lib
+ZLIBINC=       /usr/include
+
+LDADD+=        -lm -lz
+#LDADD+=       -lm -lz -lssp_nonshared   # for OSVERSION < 800000 ?
+

 DPADD+=         ${LIBM} ${LIBZ}
 
 DPADD+=         ${LIBM} ${LIBZ}
 

-CFLAGS+= -I.
+CFLAGS+= -I. -I${ZLIBINC}

 
 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
 
 pngtest: pngtest.o libpng.a
 
 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
 
 pngtest: pngtest.o libpng.a

-       ${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm
+       ${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -L${ZLIBLIB} \
+       -lpng ${LDADD}

 
 CLEANFILES= pngtest pngtest.o pngout.png
 
 
 CLEANFILES= pngtest pngtest.o pngout.png