Imported from libpng-1.2.3rc1.tar

This commit is contained in:
Glenn Randers-Pehrson 2002-04-27 10:11:25 -05:00
parent 4fb046a52d
commit 03008a08d1
69 changed files with 1350 additions and 865 deletions

View File

@ -1,49 +1,30 @@
Libpng 1.2.2 - April 15, 2002 Libpng 1.2.3rc1 - April 27, 2002
This is a public release of libpng, intended for use in production codes. 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.
Changes since the last public release (1.2.1): Changes since the last public release (1.2.2):
Fixed a bug with reading the length of iCCP profiles (Larry Reeves). version 1.2.2patch03 [April 18, 2002]
Revised makefile.linux, makefile.gcmmx, and others to generate Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and makefile.sggcc
libpng.a, libpngNN.so, libpng.so.NN, and libpngNN/png.h Fixed VER -> PNGVER typo in makefile.macosx and added install-static to install
Revised makefile.darwin to remove "-undefined suppress" option. Added install: target to makefile.32sunu and makefile.64sunu
Added checks for gamma and chromaticity values over 21474.83, which exceed Revised 15 makefiles to link libpng.a to libpngNN.a and the include libpng
the limit for PNG unsigned 32-bit integers when encoded. subdirectory to libpngNN subdirectory without the full pathname.
Revised calls to png_create_read_struct() and png_create_write_struct() Moved generation of libpng.pc from "install" to "all" in 15 makefiles.
for simpler debugging. version 1.2.3rc1 [April 27, 2002]
Revised png_zalloc() so zlib handles errors (uses PNG_FLAG_MALLOC_NULL_MEM_OK) Added install-man target to 15 makefiles (Dimitri Papadopolous-Orfanos).
Check chunk_length and idat_size for invalid (over PNG_MAX_UINT) lengths. Added $(DESTDIR) feature to 24 makefiles (Tim Mooney)
Check for invalid image dimensions in png_get_IHDR. Fixed bug with $prefix, should be $(prefix) in makefile.hpux.
Added install-shared and install-static targets to all makefiles that make Updated cygwin-specific portion of pngconf.h and revised makefile.cygwin
shared libraries. Added a link from libpngNN.pc to libpng.pc in 15 makefiles.
Always do gamma compensation when image is partially transparent. Added links from include/libpngNN/*.h to include/*.h in 24 makefiles.
Modified shared-library makefiles to install pkgconfig/libpngNN.pc. Revised makefile.darwin to make relative links without full pathname.
Export (with PNGAPI) png_zalloc, png_zfree, and png_handle_as_unknown Added setjmp() at the end of png_create_*_struct_2() in case user forgets
Removed unused png_write_destroy_info prototype from png.h to put one in their application.
Eliminated incorrect use of width_mmx from pnggccrd.c in pixel_bytes == 8 case Restored png_zalloc() and png_zfree() prototypes to version 1.2.1 and
Stopped a double free of palette, hist, and trans when not using free_me. removed them from module definition files.
Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64.
Compute background.gray and background_1.gray even when color_type is RGB
in case image gets reduced to gray later (Jason Summers).
Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library.
Added missing PNGAPI to several function definitions.
Check for invalid bit_depth or color_type in png_get_IHDR(), and
check for missing PLTE or IHDR in png_push_read_chunk() (Matthias Clasen).
Revised iTXt support to accept NULL for lang and lang_key.
Compute gamma for color components of background even when color_type is gray.
Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN
Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so
Prevent png_zalloc() from trying to memset memory that it failed to acquire.
Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).
Ensure that the right function (user or default) is used to free the
png_struct after an error in png_create_read_struct_2().
Save the ebx register in pnggccrd.c (Sami Farin)
Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner).
Updated makefiles to put headers in include/libpng and remove old include/*.h.
Revised description of png_set_filter() in libpng.3/libpng.txt.
Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd
Send comments/corrections/commendations to Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu

24
CHANGES
View File

@ -1008,7 +1008,6 @@ version 1.2.1rc1 [November 24, 2001]
Updated various makefiles so "make clean" does not remove previous major Updated various makefiles so "make clean" does not remove previous major
version of the shared library. version of the shared library.
version 1.2.1rc2 [December 4, 2001] version 1.2.1rc2 [December 4, 2001]
Added a pop/push operation to pngvcrd.c, to preserve Eflag.
Always allocate 256-entry internal palette, hist, and trans arrays, to Always allocate 256-entry internal palette, hist, and trans arrays, to
avoid out-of-bounds memory reference caused by invalid PNG datastreams. avoid out-of-bounds memory reference caused by invalid PNG datastreams.
Added a check for prefix_length > data_length in iCCP chunk handler. Added a check for prefix_length > data_length in iCCP chunk handler.
@ -1066,8 +1065,31 @@ version 1.0.13rc1 [April 7, 2002]
Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner). Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner).
Updated makefiles to put headers in include/libpng and remove old include/*.h. Updated makefiles to put headers in include/libpng and remove old include/*.h.
version 1.2.2 [April 15, 2002] version 1.2.2 [April 15, 2002]
version 1.0.13 [April 15, 2002]
Revised description of png_set_filter() in libpng.3/libpng.txt. Revised description of png_set_filter() in libpng.3/libpng.txt.
Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd
version 1.0.13patch01 [April 17, 2002]
version 1.2.2patch01 [April 17, 2002]
Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and makefile.sggcc
Fixed VER -> PNGVER typo in makefile.macosx and added install-static to install
Added install: target to makefile.32sunu and makefile.64sunu
version 1.0.13patch03 [April 18, 2002]
version 1.2.2patch03 [April 18, 2002]
Revised 15 makefiles to link libpng.a to libpngNN.a and the include libpng
subdirectory to libpngNN subdirectory without the full pathname.
Moved generation of libpng.pc from "install" to "all" in 15 makefiles.
version 1.2.3rc1 [April 27, 2002]
Added install-man target to 15 makefiles (Dimitri Papadopolous-Orfanos).
Added $(DESTDIR) feature to 24 makefiles (Tim Mooney)
Fixed bug with $prefix, should be $(prefix) in makefile.hpux.
Updated cygwin-specific portion of pngconf.h and revised makefile.cygwin
Added a link from libpngNN.pc to libpng.pc in 15 makefiles.
Added links from include/libpngNN/*.h to include/*.h in 24 makefiles.
Revised makefile.darwin to make relative links without full pathname.
Added setjmp() at the end of png_create_*_struct_2() in case user forgets
to put one in their application.
Restored png_zalloc() and png_zfree() prototypes to version 1.2.1 and
removed them from module definition files.
Send comments/corrections/commendations to Send comments/corrections/commendations to
png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu

17
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.2 - April 15, 2002 Installing libpng version 1.2.3rc1 - April 27, 2002
Before installing libpng, you must first install zlib. zlib Before installing libpng, you must first install zlib. zlib
can usually be found wherever you got libpng. zlib can be can usually be found wherever you got libpng. zlib can be
@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the
version of zlib that's installed. version of zlib that's installed.
You can rename the directories that you downloaded (they You can rename the directories that you downloaded (they
might be called "libpng-1.2.2" or "lpng109" and "zlib-1.1.3" might be called "libpng-1.2.3rc1" or "lpng109" and "zlib-1.1.3"
or "zlib113") so that you have directories called "zlib" and "libpng". or "zlib113") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this: Your directory structure should look like this:
@ -64,8 +64,8 @@ The files that are presently available in the scripts directory
include include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2) makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2, makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc1,
uses assembler code tuned for Intel MMX platform) uses assembler code tuned for Intel MMX platform)
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
@ -75,6 +75,7 @@ include
makefile.cygwin => Cygwin/gcc makefile makefile.cygwin => Cygwin/gcc makefile
makefile.darwin => Darwin makefile makefile.darwin => Darwin makefile
makefile.dec => DEC Alpha UNIX makefile makefile.dec => DEC Alpha UNIX makefile
makefile.hpgcc => FreeBSD makefile
makefile.hpgcc => HPUX makefile using gcc makefile.hpgcc => HPUX makefile using gcc
makefile.hpux => HPUX (10.20 and 11.00) makefile makefile.hpux => HPUX (10.20 and 11.00) makefile
makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static) makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static)
@ -82,13 +83,13 @@ include
libpng.icc => Project file for IBM VisualAge/C++ version 4.0 or later libpng.icc => Project file for IBM VisualAge/C++ version 4.0 or later
makefile.macosx => MACOS X Makefile makefile.macosx => MACOS X Makefile
makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng.so. makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng.so.
makefile.ne12bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so
makefile.openbsd => OpenBSD makefile makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2) makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.sunos => Sun makefile makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.2) makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.2) makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.32sunu => Sun Ultra 32-bit makefile makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc

View File

@ -1,7 +1,24 @@
Known bugs in libpng version 1.2.2 Known bugs in libpng version 1.2.3rc1
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when 1. April 16, 2002: There are typographical errors in the following:
makefile.32sunu, makefile.64sunu, makefile.macosx, makefile.sgi,
and makefile.sggcc.
STATUS: Corrected versions are supplied in
libpng-1.2.2patch01-makefiles.tar.gz
2. April 17, 2002: The symbolic link libpng.a -> /..path/lib/libpngNN.a
should simply be libpng.a -> libpngNN.a, to make it easier to move
the installed files. Also, libpng.pc should be built at "make all"
time instead of "make install" time, to avoid root writing in user's
installation directory.
STATUS: Corrected versions of 15 makefiles are supplied in
libpng-1.2.2patch03-makefiles.tar.gz (includes replacements for
all of the patch01 and patch02 makefiles).
3. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled. reading interlaced PNG files, when assembler code is enabled.
STATUS: Under investigation. The change to pnggccrd.c in libpng-1.2.1 STATUS: Under investigation. The change to pnggccrd.c in libpng-1.2.1

View File

@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following If you modify libpng you may insert additional notices immediately following
this sentence. this sentence.
libpng versions 1.0.7, July 1, 2000, through 1.2.2, April 15, 2002, are libpng versions 1.0.7, July 1, 2000, through 1.2.3rc1, April 27, 2002, are
Copyright (c) 2000-2002 Glenn Randers-Pehrson Copyright (c) 2000-2002 Glenn Randers-Pehrson
and are distributed according to the same disclaimer and license as libpng-1.0.6 and are distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors with the following individuals added to the list of Contributing Authors
@ -99,4 +99,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
randeg@alum.rpi.edu randeg@alum.rpi.edu
April 15, 2002 April 27, 2002

15
README
View File

@ -1,4 +1,4 @@
README for libpng 1.2.2 - April 15, 2002 (shared library 2.1) README for libpng 1.2.3rc1 - April 27, 2002 (shared library 2.1)
See the note about version numbers near the top of png.h See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng. See INSTALL for instructions on how to install libpng.
@ -187,9 +187,9 @@ Files in this distribution:
descrip.mms => VMS makefile for MMS or MMK descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.2) (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.gcmmx => Linux/ELF makefile (gcc, creates makefile.gcmmx => Linux/ELF makefile (gcc, creates
libpng12.so.0.1.2.2, uses assembler code libpng12.so.0.1.2.3rc1, uses assembler code
tuned for Intel MMX platform) tuned for Intel MMX platform)
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
@ -199,6 +199,7 @@ Files in this distribution:
makefile.cygwin => Cygwin/gcc makefile makefile.cygwin => Cygwin/gcc makefile
makefile.darwin => Darwin makefile makefile.darwin => Darwin makefile
makefile.dec => DEC Alpha UNIX makefile makefile.dec => DEC Alpha UNIX makefile
makefile.freebsd => FreeBSD makefile
makefile.hpgcc => HPUX makefile using gcc makefile.hpgcc => HPUX makefile using gcc
makefile.hpux => HPUX (10.20 and 11.00) makefile makefile.hpux => HPUX (10.20 and 11.00) makefile
makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static) makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static)
@ -206,15 +207,15 @@ Files in this distribution:
libpng.icc => Project file, IBM VisualAge/C++ 4.0 or later libpng.icc => Project file, IBM VisualAge/C++ 4.0 or later
makefile.macosx => MACOS X Makefile makefile.macosx => MACOS X Makefile
makefile.netbsd => NetBSD/cc makefile, PNGGCCRD, makes libpng.so. makefile.netbsd => NetBSD/cc makefile, PNGGCCRD, makes libpng.so.
makefile.ne12bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so
makefile.openbsd => OpenBSD makefile makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2) makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.sunos => Sun makefile makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.2) (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.so9 => Solaris 9 makefile makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.2) (gcc, creates libpng12.so.0.1.2.3rc1)
makefile.32sunu => Sun Ultra 32-bit makefile makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc

View File

@ -1,13 +1,13 @@
Y2K compliance in libpng: Y2K compliance in libpng:
========================= =========================
April 15, 2002 April 27, 2002
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.2 are Y2K compliant. It is my belief that earlier upward through 1.2.3rc1 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer Libpng only has three year fields. One is a 2-byte unsigned integer

2
configure vendored
View File

@ -1,5 +1,5 @@
echo " echo "
There is no \"configure\" script for Libpng-1.2.2. Instead, please There is no \"configure\" script for Libpng-1.2.3rc1. Instead, please
copy the appropriate makefile for your system from the \"scripts\" copy the appropriate makefile for your system from the \"scripts\"
directory. Read the INSTALL file for more details. directory. Read the INSTALL file for more details.
" "

View File

@ -1,85 +0,0 @@
pngsuite
--------
(c) Willem van Schaik, 1999
Permission to use, copy, and distribute these images for any purpose and
without fee is hereby granted.
These 15 images are part of the much larger PngSuite test-set of
images, available for developers of PNG supporting software. The
complete set, available at http:/www.schaik.com/pngsuite/, contains
a variety of images to test interlacing, gamma settings, ancillary
chunks, etc.
The images in this directory represent the basic PNG color-types:
grayscale (1-16 bit deep), full color (8 or 16 bit), paletted
(1-8 bit) and grayscale or color images with alpha channel. You
can use them to test the proper functioning of PNG software.
filename depth type
------------ ------ --------------
basn0g01.png 1-bit grayscale
basn0g02.png 2-bit grayscale
basn0g04.png 4-bit grayscale
basn0g08.png 8-bit grayscale
basn0g16.png 16-bit grayscale
basn2c08.png 8-bit truecolor
basn2c16.png 16-bit truecolor
basn3p01.png 1-bit paletted
basn3p02.png 2-bit paletted
basn3p04.png 4-bit paletted
basn3p08.png 8-bit paletted
basn4a08.png 8-bit gray with alpha
basn4a16.png 16-bit gray with alpha
basn6a08.png 8-bit RGBA
basn6a16.png 16-bit RGBA
Here is the correct result of typing "pngtest -m *.png" in
this directory:
Testing basn0g01.png: PASS (524 zero samples)
Filter 0 was used 32 times
Testing basn0g02.png: PASS (448 zero samples)
Filter 0 was used 32 times
Testing basn0g04.png: PASS (520 zero samples)
Filter 0 was used 32 times
Testing basn0g08.png: PASS (3 zero samples)
Filter 1 was used 9 times
Filter 4 was used 23 times
Testing basn0g16.png: PASS (1 zero samples)
Filter 1 was used 1 times
Filter 2 was used 31 times
Testing basn2c08.png: PASS (6 zero samples)
Filter 1 was used 5 times
Filter 4 was used 27 times
Testing basn2c16.png: PASS (592 zero samples)
Filter 1 was used 1 times
Filter 4 was used 31 times
Testing basn3p01.png: PASS (512 zero samples)
Filter 0 was used 32 times
Testing basn3p02.png: PASS (448 zero samples)
Filter 0 was used 32 times
Testing basn3p04.png: PASS (544 zero samples)
Filter 0 was used 32 times
Testing basn3p08.png: PASS (4 zero samples)
Filter 0 was used 32 times
Testing basn4a08.png: PASS (32 zero samples)
Filter 1 was used 1 times
Filter 4 was used 31 times
Testing basn4a16.png: PASS (64 zero samples)
Filter 0 was used 1 times
Filter 1 was used 2 times
Filter 2 was used 1 times
Filter 4 was used 28 times
Testing basn6a08.png: PASS (160 zero samples)
Filter 1 was used 1 times
Filter 4 was used 31 times
Testing basn6a16.png: PASS (1072 zero samples)
Filter 1 was used 4 times
Filter 4 was used 28 times
libpng passes test
Willem van Schaik
<willem@schaik.com>
October 1999

View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "April 15, 2002" .TH LIBPNG 3 "April 27, 2002"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc1
.SH SYNOPSIS .SH SYNOPSIS
\fI\fB \fI\fB
@ -776,14 +776,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2
\fI\fB \fI\fB
\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
\fI\fB
\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
\fI\fB
.SH DESCRIPTION .SH DESCRIPTION
The The
.I libpng .I libpng
@ -795,7 +787,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT .SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng libpng.txt - A description on how to use and modify libpng
libpng version 1.2.2 - April 15, 2002 libpng version 1.2.3rc1 - April 27, 2002
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu> <randeg@alum.rpi.edu>
Copyright (c) 1998-2002 Glenn Randers-Pehrson Copyright (c) 1998-2002 Glenn Randers-Pehrson
@ -3646,13 +3638,13 @@ application:
.SH IX. Y2K Compliance in libpng .SH IX. Y2K Compliance in libpng
April 15, 2002 April 27, 2002
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.2 are Y2K compliant. It is my belief that earlier upward through 1.2.3rc1 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that Libpng only has three year fields. One is a 2-byte unsigned integer that
@ -3781,6 +3773,7 @@ the first widely used release:
1.2.2rc1 12 10202 12.so.0.1.2.2rc1 1.2.2rc1 12 10202 12.so.0.1.2.2rc1
1.0.13 10 10013 10.so.0.1.0.13 1.0.13 10 10013 10.so.0.1.0.13
1.2.2 12 10202 12.so.0.1.2.2 1.2.2 12 10202 12.so.0.1.2.2
1.2.3rc1 12 10203 12.so.0.1.2.3rc1
Henceforth the source version will match the shared-library minor Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be and patch numbers; the shared-library major version number will be
@ -3838,7 +3831,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation. Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.2 - April 15, 2002: Libpng version 1.2.3rc1 - April 27, 2002:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
@ -3855,7 +3848,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following If you modify libpng you may insert additional notices immediately following
this sentence. this sentence.
libpng versions 1.0.7, July 1, 2000, through 1.2.2, April 15, 2002, are libpng versions 1.0.7, July 1, 2000, through 1.2.3rc1, April 27, 2002, are
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6 distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors with the following individuals added to the list of Contributing Authors
@ -3947,7 +3940,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
randeg@alum.rpi.edu randeg@alum.rpi.edu
April 15, 2002 April 27, 2002
.\" end of man page .\" end of man page

View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng libpng.txt - A description on how to use and modify libpng
libpng version 1.2.2 - April 15, 2002 libpng version 1.2.3rc1 - April 27, 2002
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<randeg@alum.rpi.edu> <randeg@alum.rpi.edu>
Copyright (c) 1998-2002 Glenn Randers-Pehrson Copyright (c) 1998-2002 Glenn Randers-Pehrson
@ -2851,13 +2851,13 @@ application:
IX. Y2K Compliance in libpng IX. Y2K Compliance in libpng
April 15, 2002 April 27, 2002
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.2.2 are Y2K compliant. It is my belief that earlier upward through 1.2.3rc1 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has three year fields. One is a 2-byte unsigned integer that Libpng only has three year fields. One is a 2-byte unsigned integer that

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "April 15, 2002" .TH LIBPNGPF 3 "April 27, 2002"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc1
(private functions) (private functions)
.SH SYNOPSIS .SH SYNOPSIS
\fB#include <png.h>\fP \fB#include <png.h>\fP
@ -531,6 +531,14 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2
\fI\fB \fI\fB
\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
\fI\fB
\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
\fI\fB
.SH DESCRIPTION .SH DESCRIPTION
The functions listed above are used privately by libpng The functions listed above are used privately by libpng
and are not recommended for use by applications. They are and are not recommended for use by applications. They are

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "April 15, 2002" .TH PNG 5 "April 27, 2002"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION

14
png.c
View File

@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions /* png.c - location for general purpose libpng functions
* *
* libpng version 1.2.2 - April 15, 2002 * libpng version 1.2.3rc1 - April 27, 2002
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -13,14 +13,14 @@
#include "png.h" #include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */ /* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_2 Your_png_h_is_not_version_1_2_2; typedef version_1_2_3rc1 Your_png_h_is_not_version_1_2_3rc1;
/* Version information for C files. This had better match the version /* Version information for C files. This had better match the version
* string defined in png.h. */ * string defined in png.h. */
#ifdef PNG_USE_GLOBAL_ARRAYS #ifdef PNG_USE_GLOBAL_ARRAYS
/* png_libpng_ver was changed to a function in version 1.0.5c */ /* png_libpng_ver was changed to a function in version 1.0.5c */
const char png_libpng_ver[18] = "1.2.2"; const char png_libpng_ver[18] = "1.2.3rc1";
/* png_sig was changed to a function in version 1.0.5c */ /* png_sig was changed to a function in version 1.0.5c */
/* Place to hold the signature string for a PNG file. */ /* Place to hold the signature string for a PNG file. */
@ -663,7 +663,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr) png_get_copyright(png_structp png_ptr)
{ {
if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */ if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */
return ((png_charp) "\n libpng version 1.2.2 - April 15, 2002\n\ return ((png_charp) "\n libpng version 1.2.3rc1 - April 27, 2002\n\
Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\ Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
@ -681,8 +681,8 @@ png_get_libpng_ver(png_structp png_ptr)
{ {
/* Version of *.c files used when building libpng */ /* Version of *.c files used when building libpng */
if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */ if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
return((png_charp) "1.2.2"); return((png_charp) "1.2.3rc1");
return((png_charp) "1.2.2"); return((png_charp) "1.2.3rc1");
} }
png_charp PNGAPI png_charp PNGAPI
@ -732,7 +732,7 @@ png_uint_32 PNGAPI
png_access_version_number(void) png_access_version_number(void)
{ {
/* Version of *.c files used when building libpng */ /* Version of *.c files used when building libpng */
return((png_uint_32) 10202L); return((png_uint_32) 10203L);
} }

41
png.h
View File

@ -1,7 +1,6 @@
/* png.h - header file for PNG reference library /* png.h - header file for PNG reference library
* *
* libpng version 1.2.2 - April 15, 2002 * libpng version 1.2.3rc1 - April 27, 2002
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -9,7 +8,7 @@
* Authors and maintainers: * Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.2.2 - April 15, 2002: Glenn * libpng versions 0.97, January 1998, through 1.2.3rc1 - April 27, 2002: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@ -87,6 +86,7 @@
* 1.2.2rc1 12 10202 12.so.0.1.2.2rc1 * 1.2.2rc1 12 10202 12.so.0.1.2.2rc1
* 1.0.13 10 10013 10.so.0.1.0.13 * 1.0.13 10 10013 10.so.0.1.0.13
* 1.2.2 12 10202 12.so.0.1.2.2 * 1.2.2 12 10202 12.so.0.1.2.2
* 1.2.3rc1 12 10203 12.so.0.1.2.3rc1
* *
* Henceforth the source version will match the shared-library major * Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be * and minor numbers; the shared-library major version number will be
@ -116,7 +116,7 @@
* If you modify libpng you may insert additional notices immediately following * If you modify libpng you may insert additional notices immediately following
* this sentence. * this sentence.
* *
* libpng versions 1.0.7, July 1, 2000, through 1.2.2, April 15, 2002, are * libpng versions 1.0.7, July 1, 2000, through 1.2.3rc1, April 27, 2002, are
* Copyright (c) 2000-2001 Glenn Randers-Pehrson, and are * Copyright (c) 2000-2001 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.0.6 * distributed according to the same disclaimer and license as libpng-1.0.6
* with the following individuals added to the list of Contributing Authors * with the following individuals added to the list of Contributing Authors
@ -221,13 +221,13 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* April 15, 2002 * April 27, 2002
* *
* Since the PNG Development group is an ad-hoc body, we can't make * Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration. * an official declaration.
* *
* This is your unofficial assurance that libpng from version 0.71 and * This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.2.2 are Y2K compliant. It is my belief that earlier * upward through 1.2.3rc1 are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant. * versions were also Y2K compliant.
* *
* Libpng only has three year fields. One is a 2-byte unsigned integer * Libpng only has three year fields. One is a 2-byte unsigned integer
@ -283,7 +283,7 @@
*/ */
/* Version information for png.h - this should match the version in png.c */ /* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.2" #define PNG_LIBPNG_VER_STRING "1.2.3rc1"
#define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM %DLLNUM% #define PNG_LIBPNG_VER_DLLNUM %DLLNUM%
@ -291,11 +291,11 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 2 #define PNG_LIBPNG_VER_MINOR 2
#define PNG_LIBPNG_VER_RELEASE 2 #define PNG_LIBPNG_VER_RELEASE 3
/* This should match the numeric part of the final component of /* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
#define PNG_LIBPNG_VER_BUILD 0 #define PNG_LIBPNG_VER_BUILD 1
#define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_ALPHA 1
#define PNG_LIBPNG_BUILD_BETA 2 #define PNG_LIBPNG_BUILD_BETA 2
@ -303,14 +303,14 @@
#define PNG_LIBPNG_BUILD_STABLE 4 #define PNG_LIBPNG_BUILD_STABLE 4
#define PNG_LIBPNG_BUILD_TYPEMASK 7 #define PNG_LIBPNG_BUILD_TYPEMASK 7
#define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */ #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */
#define PNG_LIBPNG_BUILD_TYPE 4 #define PNG_LIBPNG_BUILD_TYPE 3
/* Careful here. At one time, Guy wanted to use 082, but that would be octal. /* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros. * We must not include leading zeros.
* Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
* version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */
#define PNG_LIBPNG_VER 10202 /* 1.2.2 */ #define PNG_LIBPNG_VER 10203 /* 1.2.3 */
#ifndef PNG_VERSION_INFO_ONLY #ifndef PNG_VERSION_INFO_ONLY
@ -1263,9 +1263,9 @@ struct png_struct_def
/* This prevents a compiler error in png.c if png.c and png.h are both at /* This prevents a compiler error in png.c if png.c and png.h are both at
version 1.2.2 version 1.2.3rc1
*/ */
typedef png_structp version_1_2_2; typedef png_structp version_1_2_3rc1;
typedef png_struct FAR * FAR * png_structpp; typedef png_struct FAR * FAR * png_structpp;
@ -1817,13 +1817,6 @@ extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
/* frees a pointer allocated by png_malloc() */ /* frees a pointer allocated by png_malloc() */
extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr)); extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
/* Function to allocate memory for zlib. */
extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
uInt size));
/* Function to free memory for zlib */
extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
/* Free data that was allocated internally */ /* Free data that was allocated internally */
extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr, extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 free_me, int num)); png_infop info_ptr, png_uint_32 free_me, int num));
@ -2394,7 +2387,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.2 - April 15, 2002 (header)\n" " libpng version 1.2.3rc1 - April 27, 2002 (header)\n"
#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
/* With these routines we avoid an integer divide, which will be slower on /* With these routines we avoid an integer divide, which will be slower on
@ -2663,6 +2656,12 @@ PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr, PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
png_infop info_ptr)); png_infop info_ptr));
/* Function to allocate memory for zlib. */
PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));
/* Function to free memory for zlib */
PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
/* Reset the CRC variable */ /* Reset the CRC variable */
PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr)); PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));

View File

@ -1,6 +1,6 @@
/* pngasmrd.h - assembler version of utilities to read a PNG file /* pngasmrd.h - assembler version of utilities to read a PNG file
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 2002 Glenn Randers-Pehrson * Copyright (c) 2002 Glenn Randers-Pehrson
* *

View File

@ -1,6 +1,6 @@
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -78,12 +78,12 @@
* (no define) -- building static library, or building an * (no define) -- building static library, or building an
* application and linking to the static lib * application and linking to the static lib
* 'Cygwin' defines/defaults: * 'Cygwin' defines/defaults:
* PNG_BUILD_DLL -- building the dll * PNG_BUILD_DLL -- (ignored) building the dll
* (no define) -- building an application, linking to the dll * (no define) -- (ignored) building an application, linking to the dll
* PNG_STATIC -- building the static lib, or building an application * PNG_STATIC -- (ignored) building the static lib, or building an
* that links to the static lib. * application that links to the static lib.
* ALL_STATIC -- building various static libs, or building an application * ALL_STATIC -- (ignored) building various static libs, or building an
* that links to the static libs. * application that links to the static libs.
* Thus, * Thus,
* a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
* this bit of #ifdefs will define the 'correct' config variables based on * this bit of #ifdefs will define the 'correct' config variables based on
@ -94,7 +94,14 @@
* ALL_STATIC (since we can't #undef something outside our namespace) * ALL_STATIC (since we can't #undef something outside our namespace)
* PNG_BUILD_DLL * PNG_BUILD_DLL
* PNG_STATIC * PNG_STATIC
* (nothing) == PNG_USE_DLL * (nothing) == PNG_USE_DLL
*
* CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
* of auto-import in binutils, we no longer need to worry about
* __declspec(dllexport) / __declspec(dllimport) and friends. Therefore,
* we don't need to worry about PNG_STATIC or ALL_STATIC. However, we
* DO need to worry about PNG_BUILD_DLL because that changes some defaults
* such as CONSOLE_IO.
*/ */
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
# if defined(ALL_STATIC) # if defined(ALL_STATIC)
@ -1149,10 +1156,16 @@ typedef z_stream FAR * png_zstreamp;
# endif # endif
#endif #endif
#if defined(__CYGWIN__)
# undef PNGAPI
# define PNGAPI __cdecl
# undef PNG_IMPEXP
# define PNG_IMPEXP
#endif
#ifndef PNGAPI #ifndef PNGAPI
#if defined(__MINGW32__) || defined(__CYGWIN__) && !defined(PNG_MODULEDEF) #if defined(__MINGW32__) && !defined(PNG_MODULEDEF)
# ifndef PNG_NO_MODULEDEF # ifndef PNG_NO_MODULEDEF
# define PNG_NO_MODULEDEF # define PNG_NO_MODULEDEF
# endif # endif
@ -1165,7 +1178,7 @@ typedef z_stream FAR * png_zstreamp;
#if defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \ #if defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \
(( defined(_Windows) || defined(_WINDOWS) || \ (( defined(_Windows) || defined(_WINDOWS) || \
defined(WIN32) || defined(_WIN32) || defined(__WIN32__) \ defined(WIN32) || defined(_WIN32) || defined(__WIN32__) \
) && !defined(__CYGWIN__)) ))
# if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800)) # if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
# define PNGAPI __cdecl # define PNGAPI __cdecl
@ -1208,12 +1221,6 @@ typedef z_stream FAR * png_zstreamp;
# endif # endif
# endif /* PNG_IMPEXP */ # endif /* PNG_IMPEXP */
#else /* !(DLL || non-cygwin WINDOWS) */ #else /* !(DLL || non-cygwin WINDOWS) */
# if defined(__CYGWIN__) && !defined(PNG_DLL)
# if !defined(PNG_IMPEXP)
# define PNG_IMPEXP
# endif
# define PNGAPI __cdecl
# else
# if (defined(__IBMC__) || defined(IBMCPP__)) && defined(__OS2__) # if (defined(__IBMC__) || defined(IBMCPP__)) && defined(__OS2__)
# define PNGAPI _System # define PNGAPI _System
# define PNG_IMPEXP # define PNG_IMPEXP
@ -1224,7 +1231,6 @@ typedef z_stream FAR * png_zstreamp;
# define PNG_IMPEXP # define PNG_IMPEXP
# endif # endif
# endif # endif
# endif
#endif #endif
#endif #endif

View File

@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation /* pngerror.c - stub functions for i/o and memory allocation
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -6,7 +6,7 @@
* and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
* for Intel's performance analysis of the MMX vs. non-MMX code. * for Intel's performance analysis of the MMX vs. non-MMX code.
* *
* libpng version 1.2.2 - April 15, 2002 * libpng version 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation * Copyright (c) 1998, Intel Corporation

View File

@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct /* pngget.c - retrieval of values from info struct
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation /* pngmem.c - stub functions for memory allocation
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode /* pngpread.c - read a png file in push mode
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngread.c - read a PNG file /* pngread.c - read a PNG file
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -148,6 +148,19 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL); png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
#ifdef PNG_SETJMP_SUPPORTED
/* Applications that neglect to set up their own setjmp() and then encounter
a png_error() will longjmp here. Since the jmpbuf is then meaningless we
abort instead of returning. */
#ifdef USE_FAR_KEYWORD
if (setjmp(jmpbuf))
PNG_ABORT();
png_memcpy(png_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
#else
if (setjmp(png_ptr->jmpbuf))
PNG_ABORT();
#endif
#endif
return (png_ptr); return (png_ptr);
} }
@ -782,7 +795,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
* not called png_set_interlace_handling(), the display_row buffer will * not called png_set_interlace_handling(), the display_row buffer will
* be ignored, so pass NULL to it. * be ignored, so pass NULL to it.
* *
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2 * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc1
*/ */
void PNGAPI void PNGAPI
@ -831,7 +844,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
* only call this function once. If you desire to have an image for * only call this function once. If you desire to have an image for
* each pass of a interlaced image, use png_read_rows() instead. * each pass of a interlaced image, use png_read_rows() instead.
* *
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2 * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc1
*/ */
void PNGAPI void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image) png_read_image(png_structp png_ptr, png_bytepp image)

View File

@ -1,7 +1,7 @@
/* pngrio.c - functions for data input /* pngrio.c - functions for data input
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers /* pngrtran.c - transforms the data in a row for PNG readers
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file /* pngrutil.c - utilities to read a PNG file
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct /* pngset.c - storage of image information into info struct
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng /* pngtest.c - a simple test program to test libpng
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -1512,4 +1512,4 @@ main(int argc, char *argv[])
} }
/* Generate a compiler error if there is an old png.h in the search path. */ /* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_2 your_png_h_is_not_version_1_2_2; typedef version_1_2_3rc1 your_png_h_is_not_version_1_2_3rc1;

View File

@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers) /* pngtrans.c - transforms the data in a row (used by both readers and writers)
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -2,7 +2,7 @@
* *
* For Intel x86 CPU and Microsoft Visual C++ compiler * For Intel x86 CPU and Microsoft Visual C++ compiler
* *
* libpng version 1.2.2 - April 15, 2002 * libpng version 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* Copyright (c) 1998, Intel Corporation * Copyright (c) 1998, Intel Corporation

View File

@ -1,7 +1,7 @@
/* pngwio.c - functions for data output /* pngwio.c - functions for data output
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file /* pngwrite.c - general routines to write a PNG file
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -530,7 +530,20 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
1, png_doublep_NULL, png_doublep_NULL); 1, png_doublep_NULL, png_doublep_NULL);
#endif #endif
return ((png_structp)png_ptr); #ifdef PNG_SETJMP_SUPPORTED
/* Applications that neglect to set up their own setjmp() and then encounter
a png_error() will longjmp here. Since the jmpbuf is then meaningless we
abort instead of returning. */
#ifdef USE_FAR_KEYWORD
if (setjmp(jmpbuf))
PNG_ABORT();
png_memcpy(png_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
#else
if (setjmp(png_ptr->jmpbuf))
PNG_ABORT();
#endif
#endif
return (png_ptr);
} }
/* Initialize png_ptr structure, and allocate any memory needed */ /* Initialize png_ptr structure, and allocate any memory needed */

View File

@ -1,7 +1,7 @@
/* pngwtran.c - transforms the data in a row for PNG writers /* pngwtran.c - transforms the data in a row for PNG writers
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file /* pngwutil.c - utilities to write a PNG file
* *
* libpng 1.2.2 - April 15, 2002 * libpng 1.2.3rc1 - April 27, 2002
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998-2002 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,5 +1,5 @@
Microsoft Developer Studio Build File, Format Version 6.00 for Microsoft Developer Studio Build File, Format Version 6.00 for
libpng 1.2.2 (April 15, 2002) and zlib libpng 1.2.3rc1 (April 27, 2002) and zlib
Copyright (C) 2000 Simon-Pierre Cadieux Copyright (C) 2000 Simon-Pierre Cadieux
For conditions of distribution and use, see copyright notice in png.h For conditions of distribution and use, see copyright notice in png.h

View File

@ -6,7 +6,7 @@ LIBRARY
DESCRIPTION "PNG image compression library for Windows" DESCRIPTION "PNG image compression library for Windows"
EXPORTS EXPORTS
;Version 1.2.2 ;Version 1.2.3rc1
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
@ -213,5 +213,6 @@ EXPORTS
png_set_strip_error_numbers @193 png_set_strip_error_numbers @193
; Added at version 1.2.2 ; Added at version 1.2.2
png_handle_as_unknown @194 png_handle_as_unknown @194
png_zalloc @195 ; Added at version 1.2.2 and deleted from version 1.2.3
png_zfree @196 ; png_zalloc @195
; png_zfree @196

View File

@ -1,6 +1,6 @@
A set of project files is available for Netware. Get A set of project files is available for Netware. Get
libpng-1.2.2-project-netware.zip from a libpng distribution libpng-1.2.3rc1-project-netware.zip from a libpng distribution
site such as http://libpng.sourceforge.net site such as http://libpng.sourceforge.net
Put the zip file in this directory (projects) and then run Put the zip file in this directory (projects) and then run
"unzip -a libpng-1.2.2-project-netware.zip" "unzip -a libpng-1.2.3rc1-project-netware.zip"

View File

@ -1,6 +1,6 @@
A set of project files is available for WinCE. Get A set of project files is available for WinCE. Get
libpng-1.2.2-project-wince.zip from a libpng distribution libpng-1.2.3rc1-project-wince.zip from a libpng distribution
site such as http://libpng.sourceforge.net site such as http://libpng.sourceforge.net
Put the zip file in this directory (projects) and then run Put the zip file in this directory (projects) and then run
"unzip -a libpng-1.2.2-project-wince.zip" "unzip -a libpng-1.2.3rc1-project-wince.zip"

View File

@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
Name: libpng12 Name: libpng12
Description: Loads and saves PNG files Description: Loads and saves PNG files
Version: 1.2.2 Version: 1.2.3rc1
Libs: -L${libdir} -lpng12 Libs: -L${libdir} -lpng12
Cflags: -I${includedir}/libpng12 Cflags: -I${includedir}/libpng12

View File

@ -33,11 +33,22 @@ RANLIB=echo
LIBNAME=libpng12 LIBNAME=libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -50,12 +61,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
all: libpng.a $(LIBNAME).so pngtest all: libpng.a $(LIBNAME).so pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@ -85,42 +99,61 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
pngtest pngout.png
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock: writelock:

View File

@ -33,11 +33,22 @@ RANLIB=echo
LIBNAME=libpng12 LIBNAME=libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -50,12 +61,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
all: libpng.a $(LIBNAME).so pngtest all: libpng.a $(LIBNAME).so pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@ -85,42 +99,61 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
pngtest pngout.png
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock: writelock:

View File

@ -1,7 +1,8 @@
# makefile for libpng using gcc (generic, static library) # makefile for libpng using gcc (generic, static library)
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 2000 Cosmin Truta # Copyright (C) 2000 Cosmin Truta
# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc) # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
# Location of the zlib library and include files # Location of the zlib library and include files
@ -18,13 +19,23 @@ RM = rm -f
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
CDEBUG = -g -DPNG_DEBUG=5 CDEBUG = -g -DPNG_DEBUG=5
LDDEBUG = LDDEBUG =
CRELEASE = -O2 CRELEASE = -O2
@ -56,14 +67,17 @@ pngtest$(E): pngtest$(O) libpng$(A)
$(LD) -o $@ pngtest$(O) $(LDFLAGS) $(LD) -o $@ pngtest$(O) $(LDFLAGS)
install: libpng.a install: libpng.a
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/libpng ]; then mkdir $(INCPATH)/libpng; fi -@if [ ! -d $(DESTDIR)$(INCPATH)/libpng ]; then mkdir \
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi $(DESTDIR)$(INCPATH)/libpng; fi
-@rm $(INCPATH)/png.h -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@rm $(INCPATH)/pngconf.h -@rm $(DESTDIR)$(INCPATH)/png.h
cp png.h pngconf.h $(INCPATH)/libpng -@rm $(DESTDIR)$(INCPATH)/pngconf.h
chmod 644 $(INCPATH)/libpng/png.h $(INCPATH)/libpng/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/libpng
cp libpng.a $(LIBPATH) chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h \
$(DESTDIR)$(INCPATH)/libpng/pngconf.h
(cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
cp libpng.a $(DESTDIR)$(LIBPATH)
clean: clean:
/bin/rm -f *.o libpng.a pngtest pngout.png /bin/rm -f *.o libpng.a pngtest pngout.png

View File

@ -1,4 +1,5 @@
# makefile for libpng # makefile for libpng
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
# modified for LC56/ATARI assumes libz.lib is in same dir and uses default # modified for LC56/ATARI assumes libz.lib is in same dir and uses default
@ -10,6 +11,18 @@ LDFLAGS=-lpng -lz -lm
# where make install puts libpng.a and png.h # where make install puts libpng.a and png.h
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = $(LBR)(png.o) $(LBR)(pngset.o) $(LBR)(pngget.o) $(LBR)(pngrutil.o)\ OBJS = $(LBR)(png.o) $(LBR)(pngset.o) $(LBR)(pngget.o) $(LBR)(pngrutil.o)\
$(LBR)(pngtrans.o) $(LBR)(pngwutil.o)\ $(LBR)(pngtrans.o) $(LBR)(pngwutil.o)\
@ -25,12 +38,14 @@ pngtest.ttp: pngtest.o $(LBR)
$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o $(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o
install: libpng.a install: libpng.a
-@mkdir $(prefix)/include -@mkdir $(DESTDIR)$(INCPATH)
-@mkdir $(prefix)/include/libpng -@mkdir $(DESTDIR)$(INCPATH)/libpng
-@mkdir $(prefix)/lib -@mkdir $(DESTDIR)$(LIBPATH)
-@rm -f $(prefix)/include/png.h -@rm -f $(DESTDIR)$(INCPATH)/png.h
-@rm -f $(prefix)/include/pngconf.h -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
cp png.h $(prefix)/include/libpng cp png.h $(DESTDIR)$(INCPATH)/libpng
cp pngconf.h $(prefix)/include/libpng cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
chmod 644 $(prefix)/include/libpng/png.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
chmod 644 $(prefix)/include/libpng/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)

View File

@ -14,7 +14,7 @@ ZLIBINC=/usr/local/include
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN= ALIGN=
@ -39,6 +39,18 @@ RANLIB=ranlib
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
LIBNAME=libpng12 LIBNAME=libpng12
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
@ -49,12 +61,15 @@ OBJSDLL = $(OBJS)
.SUFFIXES: .c .o .SUFFIXES: .c .o
all: libpng.a $(LIBNAME).so pngtest all: libpng.a $(LIBNAME).so pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
cp $(LIBNAME).so* /boot/home/config/lib cp $(LIBNAME).so* /boot/home/config/lib
@ -74,41 +89,56 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -sf $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \

View File

@ -8,6 +8,16 @@
# Copyright (C) 1996, 1997 Andreas Dilger # Copyright (C) 1996, 1997 Andreas Dilger
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
# To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to # To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to
# $CFLAGS, and include pnggccrd.o in $OBJS, below. # $CFLAGS, and include pnggccrd.o in $OBJS, below.
@ -21,8 +31,8 @@ endif
prefix=/usr prefix=/usr
# Where the zlib library and include files are located # Where the zlib library and include files are located
ZLIBLIB=${prefix}/lib ZLIBLIB=$(DESTDIR)$(LIBPATH)
ZLIBINC=${prefix}/include ZLIBINC=$(DESTDIR)$(INCPATH)
#ZLIBLIB=../zlib #ZLIBLIB=../zlib
#ZLIBINC=../zlib #ZLIBINC=../zlib
@ -39,10 +49,10 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
CFLAGS=$(MINGW_CCFLAGS) -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ CFLAGS=$(MINGW_CCFLAGS) -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
-fomit-frame-pointer -fomit-frame-pointer
LIBNAME=libpng12
PNGMAJ = 0 PNGMAJ = 0
#PNGDLL = $12 PNGDLL = 12
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGMIN_BASE = 1.2.2
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(PNGDLL).dll SHAREDLIB=cygpng$(PNGDLL).dll
@ -53,18 +63,19 @@ LIBS=$(SHAREDLIB) $(STATLIB)
EXE=.exe EXE=.exe
LDFLAGS=-L. $(MINGW_LDFLAGS) -L$(ZLIBLIB) -lpng -lz LDFLAGS=-L. $(MINGW_LDFLAGS) -L$(ZLIBLIB) -lpng -lz
LDSFLAGS=-shared -L. $(MINGW_LDFLAGS) -Wl,--enable-auto-image-base LDSFLAGS=-shared -L. $(MINGW_LDFLAGS) -Wl,--export-all
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(SHAREDDEF) LDEXTRA=-Wl,--out-implib=$(IMPLIB)
RANLIB=ranlib RANLIB=ranlib
#RANLIB=echo #RANLIB=echo
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
BINPATH=$(prefix)/bin BINPATH=$(prefix)/bin
MANPATH=$(prefix)/man MANPATH=$(prefix)/man
MAN3PATH=$(MANPATH)/man3 MAN3PATH=$(MANPATH)/man3
DOCPATH=$(prefix)/doc/libpng-$(PNGMIN_BASE) MAN5PATH=$(MANPATH)/man5
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -75,12 +86,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.SUFFIXES: .c .o .pic.o .SUFFIXES: .c .o .pic.o
%.o : %.c %.o : %.c
$(CC) -c $(CFLAGS) -DPNG_STATIC -DZLIB_STATIC -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
%.pic.o : %.c %.pic.o : %.c
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
all: all-static all-shared all: all-static all-shared libpng.pc
libpng.pc: scripts/libpng.pc.in
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
static: all-static static: all-static
@ -95,7 +109,7 @@ pnggccrd.o: png.h pngconf.h
@echo ' You can ignore the single "control reaches end of non-void function"' @echo ' You can ignore the single "control reaches end of non-void function"'
@echo ' warning and multiple "<variable> defined but not used" warnings:' @echo ' warning and multiple "<variable> defined but not used" warnings:'
@echo "" @echo ""
$(CC) -c $(CFLAGS) -DPNG_STATIC -DZLIB_STATIC -o $@ $*.c $(CC) -c $(CFLAGS) -o $@ $*.c
pnggccrd.pic.o: png.h pngconf.h pnggccrd.pic.o: png.h pngconf.h
@echo "" @echo ""
@ -125,7 +139,7 @@ pngtest.pic.o: pngtest.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
pngtest.o: pngtest.c pngtest.o: pngtest.c
$(CC) $(CFLAGS) -DPNG_STATIC -DZLIB_STATIC -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
test: test-static test-shared test: test-static test-shared
@ -137,30 +151,38 @@ test-shared: pngtest$(EXE)
install: install-static install-shared install: install-static install-shared
install-static: $(STATLIB) install-headers install-docs install-man install-static: $(STATLIB) install-headers install-man
-@if [ ! -d $(LIBPATH) ]; then mkdir -p $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir -p $(DESTDIR)$(LIBPATH); fi
install -m 755 $(STATLIB) $(LIBPATH) install -m 644 $(STATLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@rm -f $(DESTDIR)$(LIBPATH)/$(STATLIB)
(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a $(STATLIB))
install-shared: $(SHAREDLIB) install-headers install-docs install-man install-shared: $(SHAREDLIB) libpng.pc install-headers install-man
-@if [ ! -d $(LIBPATH) ]; then mkdir -p $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir -p $(DESTDIR)$(LIBPATH); fi
-@if [ ! -d $(BINPATH) ]; then mkdir -p $(BINPATH); fi -@if [ ! -d $(DESTDIR)$(BINPATH) ]; then mkdir -p $(DESTDIR)$(BINPATH); fi
install -m 755 $(IMPLIB) $(LIBPATH) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
install -s -m 755 $(SHAREDLIB) $(BINPATH) mkdir -p $(DESTDIR)$(LIBPATH)/pkgconfig; fi
install -m 644 $(IMPLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).dll.a
-@rm -f $(DESTDIR)$(LIBPATH)/$(IMPLIB)
(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).dll.a $(IMPLIB))
install -s -m 755 $(SHAREDLIB) $(DESTDIR)$(BINPATH)
install -m 644 libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/$(LIBNAME).pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install-headers: install-headers:
-@if [ ! -d $(INCPATH)]; then mkdir -p $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir -p $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/libpng ]; then mkdir -p $(INCPATH)/libpng; fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then mkdir -p $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
-@rm -f ${INCPATH)/png.h -@rm -f $(DESTDIR)$(INCPATH)/png.h
-@rm -f ${INCPATH)/pngconf.h -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
install -m 644 png.h pngconf.h $(INCPATH) install -m 644 png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@rm -f $(DESTDIR)$(INCPATH)/libpng
install-docs: (cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
-@if [ ! -d $(DOCPATH) ]; then mkdir -p $(DOCPATH); fi
install -m 644 $(DOCS) $(DOCPATH)
install-man: install-man:
-@if [ ! -d $(MAN3PATH) ]; then mkdir -p $(MAN3PATH); fi -@if [ ! -d $(DESTDIR)$(MAN3PATH) ]; then mkdir -p $(DESTDIR)$(MAN3PATH); fi
install -m 644 libpngpf.3 libpng.3 $(MAN3PATH) -@if [ ! -d $(DESTDIR)$(MAN5PATH) ]; then mkdir -p $(DESTDIR)$(MAN5PATH); fi
install -m 644 libpngpf.3 libpng.3 $(DESTDIR)$(MAN3PATH)
install -m 644 png.5 $(DESTDIR)$(MAN5PATH)
clean: clean:
/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \ /bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \

View File

@ -25,12 +25,23 @@ RANLIB=ranlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -43,12 +54,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
all: libpng.a $(LIBNAME).dylib pngtest all: libpng.a $(LIBNAME).dylib pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).dylib: $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib: $(LIBNAME).$(PNGMAJ).dylib
ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib
@ -57,7 +71,7 @@ $(LIBNAME).$(PNGMAJ).dylib: $(LIBNAME).$(PNGVER).dylib
$(LIBNAME).$(PNGVER).dylib: $(OBJSDLL) $(LIBNAME).$(PNGVER).dylib: $(OBJSDLL)
$(CC) -dynamiclib \ $(CC) -dynamiclib \
-install_name $(LIBPATH)/$(LIBNAME).$(PNGMAJ).dylib \ -install_name $(DESTDIR)$(LIBPATH)/$(LIBNAME).$(PNGMAJ).dylib \
-current_version $(PNGMIN) -compatibility_version $(PNGMIN) \ -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \
-o $(LIBNAME).$(PNGVER).dylib \ -o $(LIBNAME).$(PNGVER).dylib \
$(OBJSDLL) -L$(ZLIBLIB) -lz $(OBJSDLL) -L$(ZLIBLIB) -lz
@ -69,42 +83,54 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
ln -sf $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng (cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).dylib install-shared: install-headers $(LIBNAME).dylib
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).$(PNGMAJ)*.dylib -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).$(PNGMAJ)*.dylib
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).dylib -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).dylib
-@/bin/rm -f $(LIBPATH)/libpng.dylib -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.dylib
-@/bin/rm -f $(LIBPATH)/libpng.3.dylib -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.3.dylib
-@/bin/rm -f $(LIBPATH)/libpng.3.*.dylib -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.3.*.dylib
cp $(LIBNAME).$(PNGVER).dylib $(LIBPATH) cp $(LIBNAME).$(PNGVER).dylib $(DESTDIR)$(LIBPATH)
chmod 755 $(LIBPATH)/$(LIBNAME).$(PNGVER).dylib chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).$(PNGVER).dylib
(cd $(LIBPATH); \ (cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).$(PNGVER).dylib libpng.dylib; \ ln -sf $(LIBNAME).$(PNGVER).dylib libpng.dylib; \
ln -sf $(LIBNAME).$(PNGVER).dylib libpng.3.dylib; \ ln -sf $(LIBNAME).$(PNGVER).dylib libpng.3.dylib; \
ln -sf $(LIBNAME).$(PNGVER).dylib libpng.3.$(PNGMIN).dylib; \ ln -sf $(LIBNAME).$(PNGVER).dylib libpng.3.$(PNGMIN).dylib; \
ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \ ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \
ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib) ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
rm -f *.o libpng.a $(LIBNAME).*dylib pngtest pngout.png rm -f *.o libpng.a $(LIBNAME).*dylib pngtest pngout.png

View File

@ -1,5 +1,5 @@
# makefile for libpng on DEC Alpha Unix # makefile for libpng on DEC Alpha Unix
# Copyright (C) 2000 Glenn Randers-Pehrson # Copyright (C) 2000-2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
@ -7,6 +7,17 @@
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
# Where the zlib library and include files are located # Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib #ZLIBLIB=/usr/local/lib
@ -17,7 +28,7 @@ ZLIBINC=../zlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12
@ -32,12 +43,15 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o pngwtran.o pngmem.o pngerror.o pngpread.o
all: $(LIBNAME).so libpng.a pngtest all: $(LIBNAME).so libpng.a pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@ -54,41 +68,56 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -sf $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png

View File

@ -1,10 +1,13 @@
# DJGPP (DOS gcc) makefile for libpng # DJGPP (DOS gcc) makefile for libpng
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
# where make install puts libpng.a and png.h # where make install will put libpng.a and png.h
#prefix=/usr/local #prefix=/usr/local
prefix=. prefix=.
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
CC=gcc CC=gcc
CFLAGS=-I../zlib -O CFLAGS=-I../zlib -O

View File

@ -3,8 +3,23 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
.include <bsd.own.mk>
# where make install puts libpng.a and png.h # where make install puts libpng.a and png.h
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
PNGMAJ= 5 PNGMAJ= 5
.if (${OBJFORMAT} == "elf") .if (${OBJFORMAT} == "elf")
@ -49,23 +64,22 @@ test: pngtest
./pngtest ./pngtest
install: libpng.a libpng.so.${PNGVER} install: libpng.a libpng.so.${PNGVER}
-@mkdir $(prefix)/include/libpng -@mkdir $(DESTDIR)$(INCPATH)/libpng
${INSTALL} -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \ ${INSTALL} -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \
png.h pngconf.h $(prefix)/include/libpng png.h pngconf.h $(DESTDIR)$(INCPATH)/libpng
ln -sf libpng/png.h $(prefix)/include/png.h (cd $(DESTDIR)$(INCPATH); rm -f png.h pngconf.h; ln -sf libpng/*.h .)
ln -sf libpng/pngconf.h $(prefix)/include/pngconf.h
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
libpng.a libpng.so.${PNGVER} $(prefix)/lib libpng.a libpng.so.${PNGVER} $(DESTDIR)$(LIBPATH)
$(RANLIB) $(prefix)/lib/libpng.a $(RANLIB) $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf libpng.so.${PNGVER} $(prefix)/lib/libpng.so ln -sf libpng.so.${PNGVER} $(DESTDIR)$(LIBPATH)/libpng.so
/sbin/ldconfig -R /sbin/ldconfig -R
${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ ${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
libpng.3 libpngpf.3 $(prefix)/man/man3 libpng.3 libpngpf.3 $(DESTDIR)$(MANPATH)/man3
${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ ${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
png.5 $(prefix)/man/man5 png.5 $(DESTDIR)$(MANPATH)/man5
clean: clean:
rm -f *.o libpng.a libpng.so libpng.so.${PNGVER} pngtest pngout.png rm -f *.o *.so libpng.a libpng.so.${PNGVER} pngtest pngout.png
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock: writelock:

View File

@ -15,7 +15,7 @@
LIBNAME = libpng12 LIBNAME = libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc CC=gcc
@ -62,6 +62,17 @@ RANLIB=ranlib
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -74,7 +85,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBNAME).so pngtest pngtest-static all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
pnggccrd.o: pnggccrd.c png.h pngconf.h pnggccrd.o: pnggccrd.c png.h pngconf.h
$(CC) -c $(CFLAGS) -o $@ $*.c $(CC) -c $(CFLAGS) -o $@ $*.c
@ -82,7 +96,7 @@ pnggccrd.o: pnggccrd.c png.h pngconf.h
pnggccrd.pic.o: pnggccrd.c png.h pngconf.h pnggccrd.pic.o: pnggccrd.c png.h pngconf.h
$(CC) -c $(CFLAGS) -fPIC -o $@ pnggccrd.c $(CC) -c $(CFLAGS) -fPIC -o $@ pnggccrd.c
$(LIBNAME).a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
@ -99,7 +113,7 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so pngtest: pngtest.o $(LIBNAME).so
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
pngtest-static: pngtest.o $(LIBNAME).a pngtest-static: pngtest.o libpng.a
$(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A) $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
test: pngtest pngtest-static test: pngtest pngtest-static
@ -113,41 +127,56 @@ test: pngtest pngtest-static
./pngtest-static ./pngtest-static
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -sf $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \

View File

@ -35,12 +35,23 @@ RANLIB=ranlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -53,12 +64,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBNAME).sl pngtest all: libpng.a $(LIBNAME).sl pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ)
ln -f -s $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl ln -f -s $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl
@ -77,41 +91,57 @@ test: pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then \
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi mkdir $(DESTDIR)$(INCPATH); fi
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/libpng chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
ln -sf $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).sl.$(PNGVER) install-shared: install-headers $(LIBNAME).sl.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).sl -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).sl
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).sl.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).sl.$(PNGVER) cp $(LIBNAME).sl.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).sl.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3; \ ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3; \
ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3.$(PNGMIN); \ ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3.$(PNGMIN); \
ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \
ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(SHAREDLIB).sl $(SHAREDLIB).sl.$(PNGMAJ)* \ /bin/rm -f *.o libpng.a $(SHAREDLIB).sl $(SHAREDLIB).sl.$(PNGMAJ)* \

View File

@ -19,14 +19,25 @@ RANLIB=ranlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12
# where make install puts libpng.a, libpng12.sl, and png.h # where make install puts libpng.a, libpng12.sl, and png.h
prefix=/opt/libpng prefix=/opt/libpng
LIBPATH=$prefix/lib INCPATH=$(prefix)/include
INCPATH=$prefix/include LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -39,12 +50,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) +z -o $@ $*.c $(CC) -c $(CFLAGS) +z -o $@ $*.c
all: libpng.a $(LIBNAME).sl pngtest all: libpng.a $(LIBNAME).sl pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ)
ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl
@ -63,41 +77,56 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -sf $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).sl.$(PNGVER) install-shared: install-headers $(LIBNAME).sl.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).sl -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.sl $(DESTDIR)$(LIBPATH)/$(LIBNAME).sl
-@/bin/rm -f $(LIBPATH)/libpng.sl.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.sl
-@/bin/rm -f $(LIBPATH)/libpng.sl.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.sl.3
cp $(LIBNAME).sl.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.sl.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).sl.$(PNGVER) cp $(LIBNAME).sl.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).sl.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl; \ ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl; \
ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3; \ ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3; \
ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3.$(PNGMIN); \ ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3.$(PNGMIN); \
ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \
ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ /bin/rm -f *.o libpng.a $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \

View File

@ -1,4 +1,5 @@
# makefile for libpng # makefile for libpng
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
@ -9,6 +10,18 @@
# where make install puts libpng.a and png.h # where make install puts libpng.a and png.h
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
CC=cc CC=cc
CFLAGS=-I../zlib -O CFLAGS=-I../zlib -O
@ -46,17 +59,18 @@ test: pngtest
./pngtest ./pngtest
install: libpng.a install: libpng.a
-@mkdir $(prefix)/include -@mkdir $(DESTDIR)$(INCPATH)
-@mkdir $(prefix)/include/libpng -@mkdir $(DESTDIR)$(INCPATH)/libpng
-@mkdir $(prefix)/lib -@mkdir $(DESTDIR)$(LIBPATH)
-@rm -f $(prefix)/include/png.h -@rm -f $(DESTDIR)$(INCPATH)/png.h
-@rm -f $(prefix)/include/pngconf.h -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
cp png.h $(prefix)/include/libpng cp png.h $(DESTDIR)$(INCPATH)/libpng
cp pngconf.h $(prefix)/include/libpng cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
chmod 644 $(prefix)/include/libpng/png.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
chmod 644 $(prefix)/include/libpng/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
cp libpng.a $(prefix)/lib (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
chmod 644 $(prefix)/lib/libpng.a cp libpng.a $(DESTDIR)$(LIBPATH)
chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
clean: clean:
rm -f *.o libpng.a pngtest pngout.png ansi2knr rm -f *.o libpng.a pngtest pngout.png ansi2knr

View File

@ -5,12 +5,12 @@
LIBNAME = libpng12 LIBNAME = libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc CC=gcc
# where "make install" puts libpng.a, libpng12/libpng12.so*, # where "make install" puts libpng12.a, libpng12/libpng12.so*,
# libpng12/png.h and libpng12/pngconf.h # libpng12/png.h and libpng12/pngconf.h
prefix=/usr/local prefix=/usr/local
@ -41,6 +41,17 @@ RANLIB=ranlib
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -53,12 +64,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBNAME).so pngtest all: libpng.a $(LIBNAME).so pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@ -73,7 +87,7 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so pngtest: pngtest.o $(LIBNAME).so
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
pngtest-static: pngtest.o $(LIBNAME).a pngtest-static: pngtest.o libpng.a
$(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A) $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
test: pngtest pngtest-static test: pngtest pngtest-static
@ -87,42 +101,56 @@ test: pngtest pngtest-static
./pngtest-static ./pngtest-static
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -sf $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -sf $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNMAJ)* \ /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNMAJ)* \

View File

@ -15,17 +15,31 @@ ZLIBLIB=../zlib
ZLIBINC=../zlib ZLIBINC=../zlib
CC=cc CC=cc
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
LDSHARED=cc -lz -dynamiclib -compatibility_version $(VER) -current_version $(VER)
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
VER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
LDSHARED=cc -lz -dynamiclib -compatibility_version $(PNGVER) \
-current_version $(PNGVER)
LIBNAME=libpng12 LIBNAME=libpng12
SHAREDLIB_POSTFIX=dylib SHAREDLIB_POSTFIX=dylib
LIBPATH=$(prefix)/lib
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
#RANLIB=echo #RANLIB=echo
RANLIB=ranlib RANLIB=ranlib
@ -34,15 +48,18 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o pngwtran.o pngmem.o pngerror.o pngpread.o
all: libpng.a pngtest shared all: libpng.a pngtest shared libpng.pc
shared: $(LIBNAME).$(VER).$(SHAREDLIB_POSTFIX) shared: $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
$(LIBNAME).$(VER).$(SHAREDLIB_POSTFIX): $(OBJS) $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX): $(OBJS)
$(LDSHARED) -o $@ $(OBJS) $(LDSHARED) -o $@ $(OBJS)
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
@ -53,51 +70,67 @@ test: pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).$(PNGMAJ)*.$(SHAREDLIB_POSTFIX) -@/bin/rm -f \
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).$(SHAREDLIB_POSTFIX) $(DESTDIR)$(LIBPATH)/$(LIBNAME).$(PNGMAJ)*.$(SHAREDLIB_POSTFIX)
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).$(SHAREDLIB_POSTFIX)
-@/bin/rm -f libpng.$(SHARED_POSTFIX) -@/bin/rm -f libpng.$(SHARED_POSTFIX)
-@/bin/rm -f libpng.3.$(SHARED_POSTFIX) -@/bin/rm -f libpng.3.$(SHARED_POSTFIX)
-@/bin/rm -f libpng.3.*.$(SHARED_POSTFIX) -@/bin/rm -f libpng.3.*.$(SHARED_POSTFIX)
cp $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) $(LIBPATH) cp $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) $(DESTDIR)$(LIBPATH)
chmod 755 $(LIBPATH)/$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)
(cd $(LIBPATH); \ (cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) ] ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) \
libpng.$(SHARED_POSTFIX); \ libpng.$(SHARED_POSTFIX); \
ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) ] ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) \
libpng.3.$(SHARED_POSTFIX); \ libpng.3.$(SHARED_POSTFIX); \
ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) ] ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) \
libpng.3.$(PNGMIN).$(SHARED_POSTFIX); \ libpng.3.$(PNGMIN).$(SHARED_POSTFIX); \
ln -sf $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ ln -sf $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \
$(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX); \ $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX); \
ln -sf $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \ ln -sf $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \
$(LIBNAME).$(SHAREDLIB_POSTFIX)) $(LIBNAME).$(SHAREDLIB_POSTFIX))
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install: install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
rm -f *.o libpng.a pngtest pngout.png \ rm -f *.o libpng.a pngtest pngout.png \
$(LIBNAME).$(VER).$(SHAREDLIB_POSTFIX) \ $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \
$(LIBNAME).$(SHAREDLIB_POSTFIX) $(LIBNAME).$(SHAREDLIB_POSTFIX)
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -1,9 +1,22 @@
# makefile for libpng # makefile for libpng
# Copyright (C) Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
# where make install puts libpng.a and png.h # where make install puts libpng.a and png.h
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
CC=cc CC=cc
CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips
@ -30,17 +43,18 @@ test: pngtest
./pngtest ./pngtest
install: libpng.a install: libpng.a
-@mkdir $(prefix)/include -@mkdir $(DESTDIR)$(INCPATH)
-@mkdir $(prefix)/include/libpng -@mkdir $(DESTDIR)$(INCPATH)/libpng
-@mkdir $(prefix)/lib -@mkdir $(DESTDIR)$(LIBPATH)
-@rm -f $(prefix)/include/png.h -@rm -f $(DESTDIR)$(INCPATH)/png.h
-@rm -f $(prefix)/include/pngconf.h -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
cp png.h $(prefix)/include/libpng cp png.h $(DESTDIR)$(INCPATH)/libpng
cp pngconf.h $(prefix)/include/libpng cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
chmod 644 $(prefix)/include/libpng/png.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
chmod 644 $(prefix)/include/libpng/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
cp libpng.a $(prefix)/lib (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
chmod 644 $(prefix)/lib/libpng.a cp libpng.a $(DESTDIR)$(LIBPATH)
chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
clean: clean:
rm -f *.o libpng.a pngtest pngout.png rm -f *.o libpng.a pngtest pngout.png

View File

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12 LIB= png12
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.2 SHLIB_MINOR= 1.2.3rc1
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ SRCS= pnggccrd.c 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

View File

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png LIB= png
SHLIB_MAJOR= 3 SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.2 SHLIB_MINOR= 1.2.3rc1
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ SRCS= pnggccrd.c 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

View File

@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.2 SHLIB_MINOR= 1.2.3rc1
LIB= png LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
@ -64,6 +64,8 @@ afterinstall:
@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/libpng
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
-m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png -m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png

View File

@ -1,6 +1,7 @@
# makefile for SCO OSr5 ELF and Unixware 7 with Native cc # makefile for SCO OSr5 ELF and Unixware 7 with Native cc
# Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
# force ELF build dynamic linking, SONAME setting in lib and RPATH in app # force ELF build dynamic linking, SONAME setting in lib and RPATH in app
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs # Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger # Copyright (C) 1996, 1997 Andreas Dilger
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
@ -25,12 +26,23 @@ RANLIB=echo
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12
INCPATH=$(prefix)/include/libpng INCPATH=$(prefix)/include/libpng
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -43,12 +55,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
all: libpng.a $(LIBNAME).so pngtest all: libpng.a $(LIBNAME).so pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@ -67,43 +82,60 @@ test: pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
-@/bin/rm -f $(INCPATH)/png.h mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
-@/bin/rm -f $(INCPATH)/pngconf.h -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) -@/bin/rm -f $(DESTDIR)$(INCPATH)/pngconf.h
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
install: install-static install-shared
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png

View File

@ -5,6 +5,18 @@
# where make install puts libpng.a and png.h # where make install puts libpng.a and png.h
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
# Where the zlib library and include files are located # Where the zlib library and include files are located
ZLIBLIB=/usr/local/lib32 ZLIBLIB=/usr/local/lib32
@ -24,12 +36,24 @@ LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=CC $(ABI) -shared LDSHARED=CC $(ABI) -shared
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
# See "man dso" for info about shared objects # See "man dso" for info about shared objects
LIBS=libpng12.so.$(PNGMAJ).$(PNGVER) LIBS=libpng12.so.$(PNGVER)
LIBNAME=libpng12 LIBNAME=libpng12
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib32 LIBPATH=$(prefix)/lib32
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
RANLIB=echo RANLIB=echo
#RANLIB=ranlib #RANLIB=ranlib
@ -38,12 +62,15 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o pngwtran.o pngmem.o pngerror.o pngpread.o
all: libpng.a $(LIBNAME).so.$(PNGVER) pngtest all: libpng.a $(LIBNAME).so.$(PNGVER) pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so.$(PNGVER): $(OBJS) $(LIBNAME).so.$(PNGVER): $(OBJS)
$(LDSHARED) -o $@ $(OBJS) $(LDSHARED) -o $@ $(OBJS)
rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ) rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
@ -58,41 +85,57 @@ test: pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
rm -f *.o libpng.a pngtest pngout.png rm -f *.o libpng.a pngtest pngout.png

View File

@ -31,7 +31,7 @@ LDSHARED=cc $(ABI) -shared
# See "man dso" for info about shared objects # See "man dso" for info about shared objects
LIBNAME=libpng12 LIBNAME=libpng12
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
RANLIB=echo RANLIB=echo
@ -40,14 +40,28 @@ RANLIB=echo
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
#LIBPATH=$(prefix)/lib32 #LIBPATH=$(prefix)/lib32
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o pngwtran.o pngmem.o pngerror.o pngpread.o
all: libpng.a pngtest shared all: libpng.a pngtest shared libpng.pc
shared: $(LIBNAME).so.$(PNGMAJ).$(PNGVER) shared: $(LIBNAME).so.$(PNGVER)
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
@ -66,41 +80,58 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
install: install-static install-shared
clean: clean:
rm -f *.o libpng.a pngtest pngout.png $(LIBNAME).so \ rm -f *.o libpng.a pngtest pngout.png $(LIBNAME).so \

View File

@ -1,6 +1,7 @@
# makefile for libpng on Solaris 9 (beta) with Forte cc # makefile for libpng on Solaris 9 (beta) with Forte cc
# Updated by Chad Schrock for Solaris 9 # Updated by Chad Schrock for Solaris 9
# Contributed by William L. Sebok, based on makefile.linux # Contributed by William L. Sebok, based on makefile.linux
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1998-2001 Greg Roelofs # Copyright (C) 1998-2001 Greg Roelofs
# Copyright (C) 1996-1997 Andreas Dilger # Copyright (C) 1996-1997 Andreas Dilger
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
@ -35,12 +36,23 @@ RANLIB=echo
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -53,12 +65,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
all: libpng.a $(LIBNAME).so pngtest all: libpng.a $(LIBNAME).so pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@ -88,41 +103,58 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
install: install-static install-shared
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \

View File

@ -32,12 +32,23 @@ RANLIB=echo
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not # read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it. # have to change it.
PNGMAJ = 0 PNGMAJ = 0
PNGMIN = 1.2.2 PNGMIN = 1.2.3rc1
PNGVER = $(PNGMAJ).$(PNGMIN) PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12 LIBNAME = libpng12
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib LIBPATH=$(prefix)/lib
MANPATH=$(prefix)/man
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@ -50,12 +61,15 @@ OBJSDLL = $(OBJS:.o=.pic.o)
.c.pic.o: .c.pic.o:
$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBNAME).so pngtest all: libpng.a $(LIBNAME).so pngtest libpng.pc
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
libpng.pc:
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@ -85,41 +99,57 @@ test: pngtest
./pngtest ./pngtest
install-headers: png.h pngconf.h install-headers: png.h pngconf.h
-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(DESTDIR)$(INCPATH) ]; then mkdir $(DESTDIR)$(INCPATH); fi
-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi -@if [ ! -d $(DESTDIR)$(INCPATH)/$(LIBNAME) ]; then \
cp png.h pngconf.h $(INCPATH)/$(LIBNAME) mkdir $(DESTDIR)$(INCPATH)/$(LIBNAME); fi
chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h cp png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)
-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/$(LIBNAME)/png.h \
-@/bin/rm -f $(INCPATH)/libpng $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
install-static: install-headers libpng.a install-static: install-headers libpng.a
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(LIBPATH)/$(LIBNAME).a cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(LIBPATH)/libpng.a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) install-shared: install-headers $(LIBNAME).so.$(PNGVER)
-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
-@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so -@/bin/rm -f $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* \
-@/bin/rm -f $(LIBPATH)/libpng.so $(DESTDIR)$(LIBPATH)/$(LIBNAME).so
-@/bin/rm -f $(LIBPATH)/libpng.so.3 -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so
-@/bin/rm -f $(LIBPATH)/libpng.so.3.* -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3
cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.so.3.*
chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
(cd $(LIBPATH); \ chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so; \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)) ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ))
-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
cp libpng.pc $(LIBPATH)/pkgconfig/libpng12.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install: install-static install-shared install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi
-@if [ ! -d $(MANPATH)/man3 ]; then mkdir $(MANPATH)/man3; fi
-@/bin/rm -f $(MANPATH)/man3/libpng.3
-@/bin/rm -f $(MANPATH)/man3/libpngpf.3
cp libpng.3 $(MANPATH)/man3
cp libpngpf.3 $(MANPATH)/man3
-@if [ ! -d $(MANPATH)/man5 ]; then mkdir $(MANPATH)/man5; fi
-@/bin/rm -f $(MANPATH)/man5/png.5
cp png.5 $(MANPATH)/man5
install: install-static install-shared install-man
clean: clean:
/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \

View File

@ -1,9 +1,22 @@
# makefile for libpng # makefile for libpng
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
# where make install puts libpng.a and png.h # where make install puts libpng.a and png.h
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
# Where the zlib library and include files are located # Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib #ZLIBLIB=/usr/local/lib
@ -35,17 +48,18 @@ test: pngtest
./pngtest ./pngtest
install: libpng.a install: libpng.a
-@mkdir $(prefix)/include -@mkdir $(DESTDIR)$(INCPATH)
-@mkdir $(prefix)/include/libpng -@mkdir $(DESTDIR)$(INCPATH)/libpng
-@mkdir $(prefix)/lib -@mkdir $(DESTDIR)$(LIBPATH)
-@rm -f $(prefix)/include/png.h -@rm -f $(DESTDIR)$(INCPATH)/png.h
-@rm -f $(prefix)/include/pngconf.h -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
cp png.h $(prefix)/include/libpng cp png.h $(DESTDIR)$(INCPATH)/libpng
cp pngconf.h $(prefix)/include/libpng cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
chmod 644 $(prefix)/include/libpng/png.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
chmod 644 $(prefix)/include/libpng/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
cp libpng.a $(prefix)/lib (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
chmod 644 $(prefix)/lib/libpng.a cp libpng.a $(DESTDIR)$(LIBPATH)
chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
clean: clean:
rm -f *.o libpng.a pngtest pngout.png rm -f *.o libpng.a pngtest pngout.png

View File

@ -1,9 +1,22 @@
# makefile for libpng # makefile for libpng
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
# where make install puts libpng.a and png.h # where make install puts libpng.a and png.h
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
# override DESTDIR= on the make install command line to easily support
# installing into a temporary location. Example:
#
# make install DESTDIR=/tmp/build/libpng
#
# If you're going to install into a temporary location
# via DESTDIR, that location must already exist before
# you execute make install.
DESTDIR=
# Where the zlib library and include files are located # Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib #ZLIBLIB=/usr/local/lib
@ -39,17 +52,18 @@ test: pngtest
./pngtest ./pngtest
install: libpng.a install: libpng.a
-@mkdir $(prefix)/include -@mkdir $(DESTDIR)$(INCPATH)
-@mkdir $(prefix)/include/libpng -@mkdir $(DESTDIR)$(INCPATH)/libpng
-@mkdir $(prefix)/lib -@mkdir $(DESTDIR)$(LIBPATH)
-@rm -f $(prefix)/include/png.h -@rm -f $(DESTDIR)$(INCPATH)/png.h
-@rm -f $(prefix)/include/pngconf.h -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
cp png.h $(prefix)/include/libpng cp png.h $(DESTDIR)$(INCPATH)/libpng
cp pngconf.h $(prefix)/include/libpng cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
chmod 644 $(prefix)/include/libpng/png.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
chmod 644 $(prefix)/include/libpng/pngconf.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
cp libpng.a $(prefix)/lib (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
chmod 644 $(prefix)/lib/libpng.a cp libpng.a $(DESTDIR)$(LIBPATH)
chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
clean: clean:
rm -f *.o libpng.a pngtest pngout.png rm -f *.o libpng.a pngtest pngout.png

View File

@ -7,8 +7,8 @@ unit pngdef;
interface interface
const const
PNG_LIBPNG_VER_STRING = '1.2.2'; PNG_LIBPNG_VER_STRING = '1.2.3rc1';
PNG_LIBPNG_VER = 10202; PNG_LIBPNG_VER = 10203;
type type
png_uint_32 = Cardinal; png_uint_32 = Cardinal;

View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2 ; PNG.LIB module definition file for OS/2
;---------------------------------------- ;----------------------------------------
; Version 1.2.2 ; Version 1.2.3rc1
LIBRARY PNG LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2" DESCRIPTION "PNG image compression library for OS/2"
@ -197,8 +197,6 @@ EXPORTS
png_init_mmx_flags png_init_mmx_flags
; Added at version 1.2.2: ; Added at version 1.2.2:
png_zalloc
png_zfree
png_handle_as_unknown png_handle_as_unknown
; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS

View File

@ -1,77 +0,0 @@
# makefile for libpng under FreeBSD
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h
# where make install puts libpng.a and png.h
prefix=/usr/local
# Building shared libraries is handled by the FreeBSD external Makefile,
# which uses this makefile.
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -I. -O -DPNG_USE_PNGGCCRD
.else
CFLAGS+= -I. -O -DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE
.endif
LDFLAGS+=-L. -lpng -lz -lm
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o
all: libpng.a pngtest
libpng.a: $(OBJS)
ar rc $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
test: pngtest
./pngtest
install: libpng.a
-@mkdir $(prefix)/include
-@mkdir $(prefix)/include/libpng
-@mkdir $(prefix)/lib
cp png.h $(prefix)/include
cp pngconf.h $(prefix)/include
chmod 644 $(prefix)/include/png.h
chmod 644 $(prefix)/include/pngconf.h
cp png.h $(prefix)/include/libpng
cp pngconf.h $(prefix)/include/libpng
chmod 644 $(prefix)/include/libpng/png.h
chmod 644 $(prefix)/include/libpng/pngconf.h
cp libpng.a $(prefix)/lib
chmod 644 $(prefix)/lib/libpng.a
$(RANLIB) $(prefix)/lib/libpng.a
clean:
rm -f *.o libpng.a pngtest pngout.png
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock:
chmod a-w *.[ch35] $(DOCS) scripts/*
# DO NOT DELETE THIS LINE -- make depend depends on it.
png.o: png.h pngconf.h
pngerror.o: png.h pngconf.h
pngrio.o: png.h pngconf.h
pngwio.o: png.h pngconf.h
pngmem.o: png.h pngconf.h
pngset.o: png.h pngconf.h
pngget.o: png.h pngconf.h
pngread.o: png.h pngconf.h
pngrtran.o: png.h pngconf.h
pngrutil.o: png.h pngconf.h
pngtest.o: png.h pngconf.h
pngtrans.o: png.h pngconf.h
pngwrite.o: png.h pngconf.h
pngwtran.o: png.h pngconf.h
pngwutil.o: png.h pngconf.h
pngpread.o: png.h pngconf.h
pnggccrd.o: png.h pngconf.h