mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
[devel] Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
to put png.h and pngconf.h in $prefix/include, like the other scripts, instead of in $prefix/include/libpng. Also revised makefile.sco to put them in $prefix/include/libpng12 instead of in $prefix/include/libpng/libpng12.
This commit is contained in:
parent
03f9b02953
commit
316152fe73
5
ANNOUNCE
5
ANNOUNCE
@ -722,6 +722,11 @@ version 1.4.0beta107 [December 4, 2009]
|
|||||||
Updated README
|
Updated README
|
||||||
Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.
|
Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.
|
||||||
Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.
|
Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.
|
||||||
|
Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
|
||||||
|
to put png.h and pngconf.h in $prefix/include, like the other scripts,
|
||||||
|
instead of in $prefix/include/libpng. Also revised makefile.sco
|
||||||
|
to put them in $prefix/include/libpng12 instead of in
|
||||||
|
$prefix/include/libpng/libpng12.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
|||||||
5
CHANGES
5
CHANGES
@ -2409,6 +2409,11 @@ version 1.4.0beta107 [December 4, 2009]
|
|||||||
Updated README
|
Updated README
|
||||||
Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.
|
Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.
|
||||||
Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.
|
Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.
|
||||||
|
Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
|
||||||
|
to put png.h and pngconf.h in $prefix/include, like the other scripts,
|
||||||
|
instead of in $prefix/include/libpng. Also revised makefile.sco
|
||||||
|
to put them in $prefix/include/libpng12 instead of in
|
||||||
|
$prefix/include/libpng/libpng12.
|
||||||
|
|
||||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||||
(subscription required; visit
|
(subscription required; visit
|
||||||
|
|||||||
@ -27,7 +27,7 @@ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
|
|||||||
LDADD+= -lm -lz
|
LDADD+= -lm -lz
|
||||||
DPADD+= ${LIBM} ${LIBZ}
|
DPADD+= ${LIBM} ${LIBZ}
|
||||||
|
|
||||||
CFLAGS+= -DPNG_CONFIGURE_LIBPNG -I.
|
CFLAGS+= -I.
|
||||||
|
|
||||||
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
||||||
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
||||||
|
|||||||
@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
|
|||||||
|
|
||||||
LIB= png14
|
LIB= png14
|
||||||
SHLIB_MAJOR= 0
|
SHLIB_MAJOR= 0
|
||||||
SHLIB_MINOR= 1.4.0rc02
|
SHLIB_MINOR= 1.4.0beta107
|
||||||
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
||||||
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
||||||
pngwtran.c pngmem.c pngerror.c pngpread.c
|
pngwtran.c pngmem.c pngerror.c pngpread.c
|
||||||
|
|||||||
@ -2,22 +2,22 @@
|
|||||||
# make obj && make depend && make && make test
|
# make obj && make depend && make && make test
|
||||||
# make includes && make install
|
# make includes && make install
|
||||||
# Copyright (C) 2002 Patrick R.L. Welche
|
# Copyright (C) 2002 Patrick R.L. Welche
|
||||||
# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
|
# Copyright (C) 2007-2009 Glenn Randers-Pehrson
|
||||||
#
|
#
|
||||||
# This code is released under the libpng license.
|
# This code is released under the libpng license.
|
||||||
# For conditions of distribution and use, see the disclaimer
|
# For conditions of distribution and use, see the disclaimer
|
||||||
# and license in png.h
|
# and license in png.h
|
||||||
|
|
||||||
# You should also run makefile.ne0bsd
|
# You should also run makefile.ne14bsd
|
||||||
|
|
||||||
LOCALBASE?=/usr/local
|
LOCALBASE?=/usr/local
|
||||||
LIBDIR= ${LOCALBASE}/lib
|
LIBDIR= ${LOCALBASE}/lib
|
||||||
MANDIR= ${LOCALBASE}/man
|
MANDIR= ${LOCALBASE}/man
|
||||||
INCSDIR=${LOCALBASE}/include/libpng
|
INCSDIR=${LOCALBASE}/include
|
||||||
|
|
||||||
LIB= png
|
LIB= png
|
||||||
SHLIB_MAJOR= 3
|
SHLIB_MAJOR= 3
|
||||||
SHLIB_MINOR= 1.4.0rc02
|
SHLIB_MINOR= 1.4.0beta107
|
||||||
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
|
||||||
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
|
||||||
pngwtran.c pngmem.c pngerror.c pngpread.c
|
pngwtran.c pngmem.c pngerror.c pngpread.c
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# makefile for libpng
|
# makefile for libpng
|
||||||
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
|
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
|
||||||
# Copyright (C) 2007-2008 Glenn Randers-Pehrson
|
# Copyright (C) 2007-2009 Glenn Randers-Pehrson
|
||||||
#
|
#
|
||||||
# This code is released under the libpng license.
|
# This code is released under the libpng license.
|
||||||
# For conditions of distribution and use, see the disclaimer
|
# For conditions of distribution and use, see the disclaimer
|
||||||
@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
|
|||||||
MANDIR= ${PREFIX}/man/cat
|
MANDIR= ${PREFIX}/man/cat
|
||||||
|
|
||||||
SHLIB_MAJOR= 0
|
SHLIB_MAJOR= 0
|
||||||
SHLIB_MINOR= 1.4.0rc02
|
SHLIB_MINOR= 1.4.0beta107
|
||||||
|
|
||||||
LIB= png
|
LIB= png
|
||||||
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
|
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
|
||||||
@ -20,7 +20,7 @@ SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
|
|||||||
|
|
||||||
HDRS= png.h pngconf.h
|
HDRS= png.h pngconf.h
|
||||||
|
|
||||||
CFLAGS+= -DPNG_CONFIGURE_LIBPNG -W -Wall
|
CFLAGS+= -W -Wall
|
||||||
CPPFLAGS+= -I${.CURDIR}
|
CPPFLAGS+= -I${.CURDIR}
|
||||||
|
|
||||||
NOPROFILE= Yes
|
NOPROFILE= Yes
|
||||||
@ -42,7 +42,7 @@ test: pngtest
|
|||||||
|
|
||||||
beforeinstall:
|
beforeinstall:
|
||||||
if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
|
if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
|
||||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \
|
${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
|
||||||
fi
|
fi
|
||||||
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
|
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
|
||||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
|
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
|
||||||
@ -67,7 +67,7 @@ afterinstall:
|
|||||||
@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
|
@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
|
||||||
@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
|
@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
|
||||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||||
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng
|
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
||||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||||
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
||||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
# Library name:
|
# Library name:
|
||||||
LIBNAME = libpng14
|
LIBNAME = libpng14
|
||||||
PNGMAJ = 14
|
PNGMAJ = 14
|
||||||
PNGMIN = 1.4.0rc02
|
PNGMIN = 1.4.0beta107
|
||||||
PNGVER = $(PNGMAJ).$(PNGMIN)
|
PNGVER = $(PNGMAJ).$(PNGMIN)
|
||||||
|
|
||||||
# Shared library names:
|
# Shared library names:
|
||||||
@ -41,10 +41,10 @@ exec_prefix=$(prefix)
|
|||||||
ZLIBLIB=../zlib
|
ZLIBLIB=../zlib
|
||||||
ZLIBINC=../zlib
|
ZLIBINC=../zlib
|
||||||
|
|
||||||
CFLAGS= -DPNG_CONFIGURE_LIBPNG -dy -belf -I$(ZLIBINC) -O3
|
CFLAGS= -dy -belf -I$(ZLIBINC) -O3
|
||||||
LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm
|
LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm
|
||||||
|
|
||||||
INCPATH=$(prefix)/include/libpng
|
INCPATH=$(prefix)/include
|
||||||
LIBPATH=$(exec_prefix)/lib
|
LIBPATH=$(exec_prefix)/lib
|
||||||
MANPATH=$(prefix)/man
|
MANPATH=$(prefix)/man
|
||||||
BINPATH=$(exec_prefix)/bin
|
BINPATH=$(exec_prefix)/bin
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user