Don't auto-link with 3rd party libraries in DLL build using MSVC.

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

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

-SHLIB_VER?=     14
+SHLIB_VER?=     15

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


@@ -17,13 +17,14 @@ NOOBJ=          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 pngpriv.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
 MANDIR=                /man/man
 SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
 INCSDIR=       /include/libpng
 INCDIR=                ${INCSDIR}              # for 4.x bsd.lib.mk
 MAN=           libpng.3 libpngpf.3 png.5
 MANDIR=                /man/man
 SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \

-               libpng/pngconf.h ${INCSDIR}/../pngconf.h
+               libpng/pngconf.h ${INCSDIR}/../pngconf.h \
+               libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h

 LDADD+=         -lm -lz
 DPADD+=         ${LIBM} ${LIBZ}
 
 LDADD+=         -lm -lz
 DPADD+=         ${LIBM} ${LIBZ}
 


@@ -41,6 +42,10 @@ CLEANFILES= pngtest pngtest.o pngout.png
 test: pngtest
        ./pngtest
 
 test: pngtest
        ./pngtest
 

+# see scripts/pnglibconf.mak for more options
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+       cp scripts/pnglibconf.h.prebuilt $@
+

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
        chmod a-w *.[ch35] $(DOCS) scripts/*
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
        chmod a-w *.[ch35] $(DOCS) scripts/*