mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Updated configure script to use SO number 15.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2010-02-08 15:40:53 -06:00
parent 0014f3de55
commit 3c6df196b5
36 changed files with 178 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.0beta02 - February 8, 2010 Libpng 1.5.0beta03 - February 8, 2010
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.5.0beta02.tar.xz (LZMA-compressed, recommended) 1.5.0beta03.tar.xz (LZMA-compressed, recommended)
1.5.0beta02.tar.gz 1.5.0beta03.tar.gz
1.5.0beta02.tar.bz2 1.5.0beta03.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp150b02.zip lp150b03.zip
lp150b02.7z lp150b03.7z
Other information: Other information:
1.5.0beta02-README.txt 1.5.0beta03-README.txt
1.5.0beta02-LICENSE.txt 1.5.0beta03-LICENSE.txt
Changes since the last public release (1.4.1): Changes since the last public release (1.4.1):
@ -30,9 +30,14 @@ version 1.5.0beta01 [February 7, 2010]
Moved declaration of png_struct into private pngstruct.h and png_info Moved declaration of png_struct into private pngstruct.h and png_info
into pnginfo.h into pnginfo.h
version 1.5.0beta02 [February 8, 2010] version 1.5.0beta02 [February 7, 2010]
Reverted to original png_push_save_buffer() code. Reverted to original png_push_save_buffer() code.
version 1.5.0beta03 [February 8, 2010]
Return allocated "old_buffer" in png_push_save_buffer() before
calling png_error().
Updated configure script to use SO number 15.
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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

11
CHANGES
View File

@ -2412,8 +2412,8 @@ version 1.4.0beta107 [December 4, 2009]
Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco
to put png.h and pngconf.h in $prefix/include, like the other scripts, to put png.h and pngconf.h in $prefix/include, like the other scripts,
instead of in $prefix/include/libpng. Also revised makefile.sco instead of in $prefix/include/libpng. Also revised makefile.sco
to put them in $prefix/include/libpng14 instead of in to put them in $prefix/include/libpng15 instead of in
$prefix/include/libpng/libpng14. $prefix/include/libpng/libpng15.
version 1.4.0beta108 [December 11, 2009] version 1.4.0beta108 [December 11, 2009]
Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile
@ -2506,9 +2506,14 @@ version 1.5.0beta01 [February 7, 2010]
Moved declaration of png_struct into private pngstruct.h and png_info Moved declaration of png_struct into private pngstruct.h and png_info
into pnginfo.h into pnginfo.h
version 1.5.0beta02 [February 8, 2010] version 1.5.0beta02 [February 7, 2010]
Reverted to original png_push_save_buffer() code. Reverted to original png_push_save_buffer() code.
version 1.5.0beta03 [February 8, 2010]
Return allocated "old_buffer" in png_push_save_buffer() before
calling png_error().
Updated configure script to use SO number 15.
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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

2
Makefile.am
View File

@ -73,7 +73,7 @@ EXTRA_DIST= \
${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \ ${srcdir}/contrib/visupng/* \
$(TESTS) \ $(TESTS) \
example.c libpng-1.5.0beta02.txt example.c libpng-1.5.0beta03.txt
CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
libpng.sym libpng.sym

2
Makefile.in
View File

@ -333,7 +333,7 @@ EXTRA_DIST = \
${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \ ${srcdir}/contrib/visupng/* \
$(TESTS) \ $(TESTS) \
example.c libpng-1.5.0beta02.txt example.c libpng-1.5.0beta03.txt
CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
libpng.sym libpng.sym

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta02. # Generated by GNU Autoconf 2.65 for libpng 1.5.0beta03.
# #
# Report bugs to <png-mng-implement@lists.sourceforge.net>. # Report bugs to <png-mng-implement@lists.sourceforge.net>.
# #
@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='libpng' PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng' PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.5.0beta02' PACKAGE_VERSION='1.5.0beta03'
PACKAGE_STRING='libpng 1.5.0beta02' PACKAGE_STRING='libpng 1.5.0beta03'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL='' PACKAGE_URL=''
@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures libpng 1.5.0beta02 to adapt to many kinds of systems. \`configure' configures libpng 1.5.0beta03 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1502,7 +1502,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.5.0beta02:";; short | recursive ) echo "Configuration of libpng 1.5.0beta03:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
libpng configure 1.5.0beta02 libpng configure 1.5.0beta03
generated by GNU Autoconf 2.65 generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc. Copyright (C) 2009 Free Software Foundation, Inc.
@ -2032,7 +2032,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.5.0beta02, which was It was created by libpng $as_me 1.5.0beta03, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@ $ $0 $@
@ -2840,7 +2840,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='libpng' PACKAGE='libpng'
VERSION='1.5.0beta02' VERSION='1.5.0beta03'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2904,7 +2904,7 @@ fi
PNGLIB_VERSION=1.5.0beta02 PNGLIB_VERSION=1.5.0beta03
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=5 PNGLIB_MINOR=5
PNGLIB_RELEASE=0 PNGLIB_RELEASE=0
@ -12027,7 +12027,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by libpng $as_me 1.5.0beta02, which was This file was extended by libpng $as_me 1.5.0beta03, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -12093,7 +12093,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
libpng config.status 1.5.0beta02 libpng config.status 1.5.0beta03
configured by $0, generated by GNU Autoconf 2.65, configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

4
configure.ac
View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here: dnl Version number stuff here:
AC_INIT([libpng], [1.5.0beta02], [png-mng-implement@lists.sourceforge.net]) AC_INIT([libpng], [1.5.0beta03], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake dnl stop configure from automagically running automake
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
PNGLIB_VERSION=1.5.0beta02 PNGLIB_VERSION=1.5.0beta03
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=5 PNGLIB_MINOR=5
PNGLIB_RELEASE=0 PNGLIB_RELEASE=0

12
scripts/README.txt
View File

@ -1,8 +1,8 @@
Makefiles for libpng version 1.5.0beta02 - February 8, 2010 Makefiles for libpng version 1.5.0beta03 - February 8, 2010
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.14.1.5.0beta02) (gcc, creates libpng15.so.15.1.5.0beta03)
makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from ansi2knr (Requires ansi2knr.c from
@ -20,7 +20,7 @@ Makefiles for libpng version 1.5.0beta02 - February 8, 2010
makefile.dec => DEC Alpha UNIX makefile makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning, makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng14.so.14.1.5.0beta02) gcc, creates libpng15.so.15.1.5.0beta03)
makefile.freebsd => FreeBSD makefile makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc makefile.hpgcc => HPUX makefile using gcc
@ -36,12 +36,12 @@ Makefiles for libpng version 1.5.0beta02 - February 8, 2010
makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc, makefile.sggcc => Silicon Graphics (gcc,
creates libpng14.so.14.1.5.0beta02) creates libpng15.so.15.1.5.0beta03)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc, makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng14.so.14.1.5.0beta02) creates libpng15.so.15.1.5.0beta03)
makefile.so9 => Solaris 9 makefile (gcc, makefile.so9 => Solaris 9 makefile (gcc,
creates libpng14.so.14.1.5.0beta02) creates libpng15.so.15.1.5.0beta03)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile makefile.32sunu => Sun Ultra 32-bit makefile

2
scripts/libpng-config-head.in
View File

@ -11,7 +11,7 @@
# Modeled after libxml-config. # Modeled after libxml-config.
version=1.5.0beta02 version=1.5.0beta03
prefix="" prefix=""
libdir="" libdir=""
libs="" libs=""

6
scripts/libpng.pc.in
View File

@ -1,10 +1,10 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@/libpng14 includedir=@includedir@/libpng15
Name: libpng Name: libpng
Description: Loads and saves PNG files Description: Loads and saves PNG files
Version: 1.5.0beta02 Version: 1.5.0beta03
Libs: -L${libdir} -lpng14 Libs: -L${libdir} -lpng15
Cflags: -I${includedir} Cflags: -I${includedir}

10
scripts/makefile.32sunu
View File

@ -9,8 +9,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -29,7 +29,7 @@ RM_F=/bin/rm -f
SUN_CC_FLAGS=-fast -xtarget=ultra SUN_CC_FLAGS=-fast -xtarget=ultra
SUN_LD_FLAGS=-fast -xtarget=ultra SUN_LD_FLAGS=-fast -xtarget=ultra
# where make install puts libpng.a, libpng14.so and libpng14/png.h # where make install puts libpng.a, libpng15.so and libpng15/png.h
prefix=/a prefix=/a
exec_prefix=$(prefix) exec_prefix=$(prefix)
@ -91,7 +91,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -102,7 +102,7 @@ libpng-config:
echo R_opts=\"-R$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \
echo ccopts=\"-xtarget=ultra\"; \ echo ccopts=\"-xtarget=ultra\"; \
echo ldopts=\"-xtarget=ultra\"; \ echo ldopts=\"-xtarget=ultra\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

12
scripts/makefile.64sunu
View File

@ -9,8 +9,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -29,7 +29,7 @@ RM_F=/bin/rm -f
SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9 SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9
# where make install puts libpng.a, libpng14.so and libpng14/png.h # where make install puts libpng.a, libpng15.so and libpng15/png.h
prefix=/a prefix=/a
exec_prefix=$(prefix) exec_prefix=$(prefix)
@ -47,7 +47,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
# $(WARNMORE) -g -DPNG_DEBUG=5 # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@ -91,7 +91,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -102,7 +102,7 @@ libpng-config:
echo R_opts=\"-R$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \
echo ccopts=\"-xtarget=ultra -xarch=v9\"; \ echo ccopts=\"-xtarget=ultra -xarch=v9\"; \
echo ldopts=\"-xtarget=ultra -xarch=v9\"; \ echo ldopts=\"-xtarget=ultra -xarch=v9\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

6
scripts/makefile.aix
View File

@ -21,8 +21,8 @@ RANLIB = ranlib
RM_F = rm -f RM_F = rm -f
LN_SF = ln -f -s LN_SF = ln -f -s
LIBNAME=libpng14 LIBNAME=libpng15
PNGMAJ = 14 PNGMAJ = 15
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
@ -47,7 +47,7 @@ CRELEASE = -O2
LDRELEASE = -s LDRELEASE = -s
WARNMORE=-W -Wall WARNMORE=-W -Wall
CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
LDFLAGS = -L. -L$(ZLIBLIB) -lpng14 -lz -lm $(LDRELEASE) LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE)
# File extensions # File extensions
O=.o O=.o

12
scripts/makefile.beos
View File

@ -9,8 +9,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -45,7 +45,7 @@ CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \
# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz
# where make install puts libpng.a, libpng14.so*, and png.h # where make install puts libpng.a, libpng15.so*, and png.h
prefix=/usr/local prefix=/usr/local
exec_prefix=$(prefix) exec_prefix=$(prefix)
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
@ -87,13 +87,13 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \ echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo libs=\"-lpng14 -lz \"; \ echo libs=\"-lpng15 -lz \"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config
@ -106,7 +106,7 @@ $(LIBSOMAJ): $(OBJSDLL)
$(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS) $(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -L$(ZLIBLIB) -L. -lz -lpng14 -o pngtest pngtest.o $(CC) -L$(ZLIBLIB) -L. -lz -lpng15 -o pngtest pngtest.o
test: pngtest test: pngtest
./pngtest ./pngtest

6
scripts/makefile.cegcc
View File

@ -28,10 +28,10 @@ VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng NAME = libpng
PACKAGE = $(NAME)-$(VER) PACKAGE = $(NAME)-$(VER)
BIN = libpng14-0.dll BIN = libpng15-0.dll
LIB = libpng14.a libpng14.dll.a libpng.a libpng.dll.a scripts/png32ce.def LIB = libpng15.a libpng15.dll.a libpng.a libpng.dll.a scripts/png32ce.def
INCLUDE = png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h INCLUDE = png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h
PC = libpng14.pc libpng.pc PC = libpng15.pc libpng.pc
MANIFESTVERBIN = "Libpng-$(VER): Binary files" MANIFESTVERBIN = "Libpng-$(VER): Binary files"
MANIFESTVERDEV = "Libpng-$(VER): Developer files" MANIFESTVERDEV = "Libpng-$(VER): Developer files"

16
scripts/makefile.cygwin
View File

@ -65,9 +65,9 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-W -Wall -O3 $(ALIGN) -funroll-loops \ -W -Wall -O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
CYGDLL = 14 CYGDLL = 15
SHAREDLIB=cygpng$(CYGDLL).dll SHAREDLIB=cygpng$(CYGDLL).dll
STATLIB=libpng.a STATLIB=libpng.a
@ -130,7 +130,7 @@ libpng.pc: scripts/libpng.pc.in
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz! > libpng.pc -e s!-lpng15!-lpng15\ -lz! > libpng.pc
libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
@echo -e Making $(LIBNAME) libpng-config file for this libpng \ @echo -e Making $(LIBNAME) libpng-config file for this libpng \
@ -243,16 +243,16 @@ test-dd:
echo echo
echo Testing installed dynamic shared library in $(DL). echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) $(CFLAGS) \ $(CC) -I$(DI) $(CFLAGS) \
`$(BINPATH)/libpng14-config --cflags` pngtest.c \ `$(BINPATH)/libpng15-config --cflags` pngtest.c \
-L$(DL) -L$(ZLIBLIB) \ -L$(DL) -L$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/libpng14-config --ldflags` -o pngtestd `$(BINPATH)/libpng15-config --ldflags`
./pngtestd pngtest.png ./pngtestd pngtest.png
test-installed: test-installed:
$(CC) $(CFLAGS) \ $(CC) $(CFLAGS) \
`$(BINPATH)/libpng14-config --cflags` pngtest.c \ `$(BINPATH)/libpng15-config --cflags` pngtest.c \
-L$(ZLIBLIB) \ -L$(ZLIBLIB) \
-o pngtesti$(EXE) `$(BINPATH)/libpng14-config --ldflags` -o pngtesti$(EXE) `$(BINPATH)/libpng15-config --ldflags`
./pngtesti$(EXE) pngtest.png ./pngtesti$(EXE) pngtest.png
clean: clean:

14
scripts/makefile.darwin
View File

@ -9,7 +9,7 @@
# 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
# where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h # where "make install" puts libpng.a, libpng15.dylib, png.h and pngconf.h
prefix=/usr/local prefix=/usr/local
exec_prefix=$(prefix) exec_prefix=$(prefix)
@ -20,8 +20,8 @@ ZLIBLIB=../zlib
ZLIBINC=../zlib ZLIBINC=../zlib
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).dylib LIBSO=$(LIBNAME).dylib
@ -39,7 +39,7 @@ RM_F=/bin/rm -f
# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops
CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@ -83,14 +83,14 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz! > libpng.pc -e s!-lpng15!-lpng15\ -lz! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \ echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz\"; \ echo libs=\"-lpng15 -lz\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config
@ -100,7 +100,7 @@ $(LIBSO): $(LIBSOMAJ)
$(LIBSOMAJ): $(OBJSDLL) $(LIBSOMAJ): $(OBJSDLL)
$(CC) -dynamiclib \ $(CC) -dynamiclib \
-install_name $(LIBPATH)/$(LIBSOMAJ) \ -install_name $(LIBPATH)/$(LIBSOMAJ) \
-current_version 14 -compatibility_version 14 \ -current_version 15 -compatibility_version 15 \
-o $(LIBSOMAJ) \ -o $(LIBSOMAJ) \
$(OBJSDLL) -L$(ZLIBLIB) -lz $(OBJSDLL) -L$(ZLIBLIB) -lz

8
scripts/makefile.dec
View File

@ -7,8 +7,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
PNGMAJ = 14 PNGMAJ = 15
LIBNAME = libpng14 LIBNAME = libpng15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -71,7 +71,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -79,7 +79,7 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo ccopts=\"-std\"; \ echo ccopts=\"-std\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

24
scripts/makefile.elf
View File

@ -1,4 +1,4 @@
# makefile for libpng.a and libpng14.so on Linux ELF with gcc # makefile for libpng.a and libpng15.so on Linux ELF with gcc
# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs
# and Glenn Randers-Pehrson # and Glenn Randers-Pehrson
# Copyright (C) 1996, 1997 Andreas Dilger # Copyright (C) 1996, 1997 Andreas Dilger
@ -10,19 +10,19 @@
# Modified for Debian by Junichi Uekawa and Josselin Mouette # Modified for Debian by Junichi Uekawa and Josselin Mouette
# Major modifications are: # Major modifications are:
# * link libpng explicitly with libz and libm # * link libpng explicitly with libz and libm
# * $(OLDSO).14 is a symlink rather than a different library # * $(OLDSO).15 is a symlink rather than a different library
# * versioned symbols # * versioned symbols
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOREL=$(LIBSOMAJ).$(RELEASE) LIBSOREL=$(LIBSOMAJ).$(RELEASE)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14 OLDSOMAJ=libpng.so.15
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -32,8 +32,8 @@ LN_SF=ln -sf
RANLIB=ranlib RANLIB=ranlib
RM_F=/bin/rm -f RM_F=/bin/rm -f
# where "make install" puts libpng14.a, libpng14.so*, # where "make install" puts libpng15.a, libpng15.so*,
# libpng14/png.h and libpng14/pngconf.h # libpng15/png.h and libpng15/pngconf.h
# Prefix must be a full pathname. # Prefix must be a full pathname.
prefix=/usr/local prefix=/usr/local
exec_prefix=$(prefix) exec_prefix=$(prefix)
@ -57,7 +57,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
CFLAGS=-W -Wall -D_REENTRANT -O2 \ CFLAGS=-W -Wall -D_REENTRANT -O2 \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -lpng14 LDFLAGS=-L. -lpng15
LDFLAGS_A=libpng.a -lz -lm LDFLAGS_A=libpng.a -lz -lm
LIBADDFLAGS=-lz -lm LIBADDFLAGS=-lz -lm
@ -104,11 +104,11 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng.syms: png.h pngconf.h libpng.syms: png.h pngconf.h
$(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\ $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\
awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG14_%s {global:\n",PNGMAJ)}\ awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG15_%s {global:\n",PNGMAJ)}\
{ for (i=1;i+2<=NF;++i)\ { for (i=1;i+2<=NF;++i)\
if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\ if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\
print $$(i+1) ";";\ print $$(i+1) ";";\
@ -125,8 +125,8 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"\"; \ echo L_opts=\"\"; \
echo R_opts=\"\"; \ echo R_opts=\"\"; \
echo libs=\"-lpng14\"; \ echo libs=\"-lpng15\"; \
echo all_libs=\"-lpng14 $(LIBADDFLAGS)\"; \ echo all_libs=\"-lpng15 $(LIBADDFLAGS)\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

2
scripts/makefile.freebsd
View File

@ -6,7 +6,7 @@
# and license in png.h # and license in png.h
PREFIX?= /usr/local PREFIX?= /usr/local
SHLIB_VER?= 14 SHLIB_VER?= 15
LIB= png LIB= png
SHLIB_MAJOR= ${SHLIB_VER} SHLIB_MAJOR= ${SHLIB_VER}

10
scripts/makefile.hp64
View File

@ -19,8 +19,8 @@ ZLIBINC=/opt/zlib/include
# SHAREDLIB=libz.sl # SHAREDLIB=libz.sl
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).sl LIBSO=$(LIBNAME).sl
@ -44,7 +44,7 @@ CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
# where make install puts libpng.a, libpng14.sl, and png.h # where make install puts libpng.a, libpng15.sl, and png.h
prefix=/opt/libpng prefix=/opt/libpng
exec_prefix=$(prefix) exec_prefix=$(prefix)
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
@ -89,7 +89,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -97,7 +97,7 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

12
scripts/makefile.hpgcc
View File

@ -9,8 +9,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).sl LIBSO=$(LIBNAME).sl
@ -54,8 +54,8 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm
LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@ -99,13 +99,13 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \ echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

10
scripts/makefile.hpux
View File

@ -19,8 +19,8 @@ ZLIBINC=/opt/zlib/include
# SHAREDLIB=libz.sl # SHAREDLIB=libz.sl
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).sl LIBSO=$(LIBNAME).sl
@ -36,7 +36,7 @@ LN_SF=ln -sf
RANLIB=ranlib RANLIB=ranlib
RM_F=/bin/rm -f RM_F=/bin/rm -f
# where make install puts libpng.a, libpng14.sl, and png.h # where make install puts libpng.a, libpng15.sl, and png.h
prefix=/opt/libpng prefix=/opt/libpng
exec_prefix=$(prefix) exec_prefix=$(prefix)
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
@ -86,7 +86,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -94,7 +94,7 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \ echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

16
scripts/makefile.linux
View File

@ -1,4 +1,4 @@
# makefile for libpng.a and libpng14.so on Linux ELF with gcc # makefile for libpng.a and libpng15.so on Linux ELF with gcc
# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs and # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs and
# Glenn Randers-Pehrson # Glenn Randers-Pehrson
# Copyright (C) 1996, 1997 Andreas Dilger # Copyright (C) 1996, 1997 Andreas Dilger
@ -8,8 +8,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
RELEASE = 0 RELEASE = 0
# Shared library names: # Shared library names:
@ -26,8 +26,8 @@ LN_SF=ln -sf
RANLIB=ranlib RANLIB=ranlib
RM_F=/bin/rm -f RM_F=/bin/rm -f
# where "make install" puts libpng14.a, libpng14.so*, # where "make install" puts libpng15.a, libpng15.so*,
# libpng14/png.h and libpng14/pngconf.h # libpng15/png.h and libpng15/pngconf.h
# Prefix must be a full pathname. # Prefix must be a full pathname.
prefix=/usr/local prefix=/usr/local
exec_prefix=$(prefix) exec_prefix=$(prefix)
@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm
LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
@ -96,7 +96,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -104,7 +104,7 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

16
scripts/makefile.mingw
View File

@ -65,9 +65,9 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-W -Wall -O3 $(ALIGN) -funroll-loops \ -W -Wall -O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
MINGDLL = 14 MINGDLL = 15
SHAREDLIB=libpng$(MINGDLL).dll SHAREDLIB=libpng$(MINGDLL).dll
STATLIB=libpng.a STATLIB=libpng.a
@ -127,7 +127,7 @@ libpng.pc: scripts/libpng.pc.in
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
@echo -e Making $(LIBNAME) libpng-config file for this libpng \ @echo -e Making $(LIBNAME) libpng-config file for this libpng \
@ -234,16 +234,16 @@ test-dd:
echo echo
echo Testing installed dynamic shared library in $(DL). echo Testing installed dynamic shared library in $(DL).
$(CC) -I$(DI) $(CFLAGS) \ $(CC) -I$(DI) $(CFLAGS) \
`$(BINPATH)/libpng14-config --cflags` pngtest.c \ `$(BINPATH)/libpng15-config --cflags` pngtest.c \
-L$(DL) -L$(ZLIBLIB) \ -L$(DL) -L$(ZLIBLIB) \
-o pngtestd `$(BINPATH)/libpng14-config --ldflags` -o pngtestd `$(BINPATH)/libpng15-config --ldflags`
./pngtestd pngtest.png ./pngtestd pngtest.png
test-installed: test-installed:
$(CC) $(CFLAGS) \ $(CC) $(CFLAGS) \
`$(BINPATH)/libpng14-config --cflags` pngtest.c \ `$(BINPATH)/libpng15-config --cflags` pngtest.c \
-L$(ZLIBLIB) \ -L$(ZLIBLIB) \
-o pngtesti$(EXE) `$(BINPATH)/libpng14-config --ldflags` -o pngtesti$(EXE) `$(BINPATH)/libpng15-config --ldflags`
./pngtesti$(EXE) pngtest.png ./pngtesti$(EXE) pngtest.png
clean: clean:

6
scripts/makefile.ne12bsd
View File

@ -13,11 +13,11 @@
LOCALBASE?=/usr/local LOCALBASE?=/usr/local
LIBDIR= ${LOCALBASE}/lib LIBDIR= ${LOCALBASE}/lib
MANDIR= ${LOCALBASE}/man MANDIR= ${LOCALBASE}/man
INCSDIR=${LOCALBASE}/include/libpng14 INCSDIR=${LOCALBASE}/include/libpng15
LIB= png14 LIB= png15
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.5.0beta02 SHLIB_MINOR= 1.5.0beta03
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

4
scripts/makefile.netbsd
View File

@ -8,7 +8,7 @@
# 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.ne14bsd # You should also run makefile.ne15bsd
LOCALBASE?=/usr/local LOCALBASE?=/usr/local
LIBDIR= ${LOCALBASE}/lib LIBDIR= ${LOCALBASE}/lib
@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png LIB= png
SHLIB_MAJOR= 3 SHLIB_MAJOR= 3
SHLIB_MINOR= 1.5.0beta02 SHLIB_MINOR= 1.5.0beta03
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
scripts/makefile.openbsd
View File

@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.5.0beta02 SHLIB_MINOR= 1.5.0beta03
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 \

10
scripts/makefile.sco
View File

@ -10,8 +10,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -38,7 +38,7 @@ ZLIBLIB=../zlib
ZLIBINC=../zlib ZLIBINC=../zlib
CFLAGS= -dy -belf -I$(ZLIBINC) -O3 CFLAGS= -dy -belf -I$(ZLIBINC) -O3
LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@ -82,7 +82,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -90,7 +90,7 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo ccopts=\"-belf\"; \ echo ccopts=\"-belf\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

12
scripts/makefile.sggcc
View File

@ -1,4 +1,4 @@
# makefile for libpng.a and libpng14.so, SGI IRIX with 'cc' # makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
# Copyright (C) 2001-2002, 2006, 2010 Glenn Randers-Pehrson # Copyright (C) 2001-2002, 2006, 2010 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# #
@ -7,8 +7,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -24,7 +24,7 @@ LN_SF=ln -sf
RANLIB=echo RANLIB=echo
RM_F=/bin/rm -f RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng14.so, and libpng14/png.h # Where make install puts libpng.a, libpng15.so, and libpng15/png.h
# Prefix must be a full pathname. # Prefix must be a full pathname.
prefix=/usr/local prefix=/usr/local
@ -87,7 +87,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -98,7 +98,7 @@ libpng-config:
echo ldopts=\"$(ABI)\"; \ echo ldopts=\"$(ABI)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libdir=\"$(LIBPATH)\"; \ echo libdir=\"$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

14
scripts/makefile.sgi
View File

@ -1,4 +1,4 @@
# makefile for libpng.a and libpng14.so, SGI IRIX with 'cc' # makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
# Copyright (C) 2001-2002, 2006, 2007, 2010 Glenn Randers-Pehrson # Copyright (C) 2001-2002, 2006, 2007, 2010 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# #
@ -7,8 +7,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -24,7 +24,7 @@ LN_SF=ln -sf
RANLIB=echo RANLIB=echo
RM_F=/bin/rm -f RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng14.so, and libpng14/png.h # Where make install puts libpng.a, libpng15.so, and libpng15/png.h
# Prefix must be a full pathname. # Prefix must be a full pathname.
prefix=/usr/local prefix=/usr/local
@ -46,7 +46,7 @@ WARNMORE=-fullwarn
# Note: -KPIC is the default anyhow # Note: -KPIC is the default anyhow
#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5
CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE)
LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng15 -lz -lm
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
-set_version sgi$(PNGMAJ).0 -set_version sgi$(PNGMAJ).0
@ -88,7 +88,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -98,7 +98,7 @@ libpng-config:
echo ldopts=\"$(ABI)\"; \ echo ldopts=\"$(ABI)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo libdir=\"$(LIBPATH)\"; \ echo libdir=\"$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

10
scripts/makefile.so9
View File

@ -10,8 +10,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
PNGMAJ = 14 PNGMAJ = 15
LIBNAME = libpng14 LIBNAME = libpng15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -48,7 +48,7 @@ ZLIBINC=/usr/include
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE #CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE
CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@ -92,7 +92,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -100,7 +100,7 @@ libpng-config:
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

12
scripts/makefile.solaris
View File

@ -9,8 +9,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -26,7 +26,7 @@ LN_SF=ln -f -s
RANLIB=echo RANLIB=echo
RM_F=/bin/rm -f RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng14.so*, and png.h # Where make install puts libpng.a, libpng15.so*, and png.h
prefix=/usr/local prefix=/usr/local
exec_prefix=$(prefix) exec_prefix=$(prefix)
@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
CFLAGS=-I$(ZLIBINC) -W -Wall -O \ CFLAGS=-I$(ZLIBINC) -W -Wall -O \
# $(WARNMORE) -g -DPNG_DEBUG=5 # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@ -88,7 +88,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -97,7 +97,7 @@ libpng-config:
echo cppflags=\"\"; \ echo cppflags=\"\"; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

12
scripts/makefile.solaris-x86
View File

@ -9,8 +9,8 @@
# and license in png.h # and license in png.h
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng15
PNGMAJ = 14 PNGMAJ = 15
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
@ -26,7 +26,7 @@ LN_SF=ln -f -s
RANLIB=echo RANLIB=echo
RM_F=/bin/rm -f RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng14.so*, and png.h # Where make install puts libpng.a, libpng15.so*, and png.h
prefix=/usr/local prefix=/usr/local
exec_prefix=$(prefix) exec_prefix=$(prefix)
@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
CFLAGS=-I$(ZLIBINC) -W -Wall -O \ CFLAGS=-I$(ZLIBINC) -W -Wall -O \
# $(WARNMORE) -g -DPNG_DEBUG=5 # $(WARNMORE) -g -DPNG_DEBUG=5
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib LIBPATH=$(exec_prefix)/lib
@ -88,7 +88,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \ -e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \ -e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config: libpng-config:
( cat scripts/libpng-config-head.in; \ ( cat scripts/libpng-config-head.in; \
@ -97,7 +97,7 @@ libpng-config:
echo cppflags=\""; \ echo cppflags=\""; \
echo L_opts=\"-L$(LIBPATH)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \
echo R_opts=\"-R$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \ echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config chmod +x libpng-config

2
scripts/png32ce.def
View File

@ -15,7 +15,7 @@ LIBRARY lpngce
png_get_int_32 png_get_int_32
EXPORTS EXPORTS
;Version 1.5.0beta02 ;Version 1.5.0beta03
png_build_grayscale_palette @1 png_build_grayscale_palette @1
; png_check_sig @2 ; png_check_sig @2
png_chunk_error @3 png_chunk_error @3

2
scripts/pngos2.def
View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2 ; PNG.LIB module definition file for OS/2
;---------------------------------------- ;----------------------------------------
; Version 1.5.0beta02 ; Version 1.5.0beta03
LIBRARY PNG LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2" DESCRIPTION "PNG image compression library for OS/2"

2
scripts/pngwin.def
View File

@ -5,7 +5,7 @@
LIBRARY LIBRARY
EXPORTS EXPORTS
;Version 1.5.0beta02 ;Version 1.5.0beta03
png_build_grayscale_palette png_build_grayscale_palette
png_chunk_error png_chunk_error
png_chunk_warning png_chunk_warning