From 037023bb311f7b442e05d036b08e5c578253c522 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 24 Jun 2009 10:27:36 -0500 Subject: [PATCH] [devel] Revise references to zlib-libpng license --- LICENSE | 2 ++ contrib/pngminim/decoder/pngusr.h | 3 ++- contrib/pngminim/encoder/pngusr.h | 3 ++- contrib/pngminim/preader/pngusr.h | 3 ++- example.c | 1 - libpng-1.4.0beta65.txt | 6 ++++-- libpng.3 | 8 ++++++-- png.c | 4 ++-- pngconf.h | 3 ++- pngerror.c | 3 ++- pngget.c | 3 ++- pngmem.c | 3 ++- pngpread.c | 4 ++-- pngpriv.h | 4 ++-- pngread.c | 3 ++- pngrio.c | 3 ++- pngrtran.c | 3 ++- pngrutil.c | 3 ++- pngset.c | 3 ++- pngtest.c | 3 ++- pngtrans.c | 4 ++-- pngwio.c | 3 ++- pngwrite.c | 4 ++-- pngwtran.c | 4 ++-- pngwutil.c | 4 ++-- scripts/CMakeLists.txt | 3 ++- scripts/libpng-config-head.in | 3 ++- scripts/libpng-config.in | 3 ++- scripts/libpng.icc | 3 ++- scripts/makefile.32sunu | 3 ++- scripts/makefile.64sunu | 3 ++- scripts/makefile.aix | 3 ++- scripts/makefile.amiga | 3 ++- scripts/makefile.atari | 3 ++- scripts/makefile.beos | 3 ++- scripts/makefile.cygwin | 3 ++- scripts/makefile.darwin | 3 ++- scripts/makefile.dec | 3 ++- scripts/makefile.dj2 | 3 ++- scripts/makefile.elf | 3 ++- scripts/makefile.freebsd | 3 ++- scripts/makefile.gcc | 3 ++- scripts/makefile.hp64 | 3 ++- scripts/makefile.hpgcc | 3 ++- scripts/makefile.hpux | 3 ++- scripts/makefile.ibmc | 3 ++- scripts/makefile.intel | 3 ++- scripts/makefile.knr | 3 ++- scripts/makefile.linux | 3 ++- scripts/makefile.mingw | 3 ++- scripts/makefile.mips | 3 ++- scripts/makefile.msc | 3 ++- scripts/makefile.ne12bsd | 3 ++- scripts/makefile.netbsd | 3 ++- scripts/makefile.nommx | 3 ++- scripts/makefile.openbsd | 3 ++- scripts/makefile.os2 | 3 ++- scripts/makefile.sco | 3 ++- scripts/makefile.sggcc | 3 ++- scripts/makefile.sgi | 3 ++- scripts/makefile.so9 | 3 ++- scripts/makefile.solaris | 3 ++- scripts/makefile.std | 3 ++- scripts/makefile.sunos | 3 ++- scripts/makefile.vcawin32 | 3 ++- scripts/makefile.vcwin32 | 3 ++- scripts/makefile.watcom | 3 ++- scripts/smakefile.ppc | 3 ++- 68 files changed, 140 insertions(+), 76 deletions(-) diff --git a/LICENSE b/LICENSE index 35f276e97..ba2706445 100644 --- a/LICENSE +++ b/LICENSE @@ -8,6 +8,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. +This code is released under the zlib-libpng license. + libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 24, 2009, are Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h index 9641601b2..86c688780 100644 --- a/contrib/pngminim/decoder/pngusr.h +++ b/contrib/pngminim/decoder/pngusr.h @@ -3,7 +3,8 @@ * Copyright (c) 2007, 2009 Glenn Randers-Pehrson * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h index 9f2020e74..9c6310fe9 100644 --- a/contrib/pngminim/encoder/pngusr.h +++ b/contrib/pngminim/encoder/pngusr.h @@ -3,7 +3,8 @@ * Copyright (c) 2007, 2009 Glenn Randers-Pehrson * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h index cbbf81dac..6ea9d2c02 100644 --- a/contrib/pngminim/preader/pngusr.h +++ b/contrib/pngminim/preader/pngusr.h @@ -3,7 +3,8 @@ * Copyright (c) 2007, 2009 Glenn Randers-Pehrson * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ diff --git a/example.c b/example.c index a647b063e..2571b145f 100644 --- a/example.c +++ b/example.c @@ -7,7 +7,6 @@ * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) - * */ /* This is an example of how to use libpng to read and write PNG files. diff --git a/libpng-1.4.0beta65.txt b/libpng-1.4.0beta65.txt index 2a97dd351..ef113b725 100644 --- a/libpng-1.4.0beta65.txt +++ b/libpng-1.4.0beta65.txt @@ -4,8 +4,10 @@ libpng.txt - A description on how to use and modify libpng Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson - For conditions of distribution and use, see copyright - notice in png.h. + + This document is released under the zlib-libpng license. + For conditions of distribution and use, see copyright notice, disclaimer, + and license in png.h Based on: diff --git a/libpng.3 b/libpng.3 index d07699a76..7f835186d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -813,8 +813,10 @@ libpng.txt - A description on how to use and modify libpng Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson - For conditions of distribution and use, see copyright - notice in png.h. + + This document is released under the zlib-libpng license. + For conditions of distribution and use, see copyright notice, disclaimer, + and license in png.h Based on: @@ -4205,6 +4207,8 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. +This code is released under the zlib-libpng license. + libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 24, 2009, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 diff --git a/png.c b/png.c index 659a21681..aabb3b9da 100644 --- a/png.c +++ b/png.c @@ -7,8 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h - * + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h */ #define PNG_NO_EXTERN diff --git a/pngconf.h b/pngconf.h index db99dba96..90f4ec3ff 100644 --- a/pngconf.h +++ b/pngconf.h @@ -8,7 +8,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * */ diff --git a/pngerror.c b/pngerror.c index 9a51d26d3..8fa0c3263 100644 --- a/pngerror.c +++ b/pngerror.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This file provides a location for all error handling. Users who * need special error handling are expected to write replacement functions diff --git a/pngget.c b/pngget.c index 632d325f4..7ebf75403 100644 --- a/pngget.c +++ b/pngget.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * */ diff --git a/pngmem.c b/pngmem.c index eca9a2cbd..14927f795 100644 --- a/pngmem.c +++ b/pngmem.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This file provides a location for all memory allocation. Users who * need special memory handling are expected to supply replacement diff --git a/pngpread.c b/pngpread.c index ecef57c98..69153edd8 100644 --- a/pngpread.c +++ b/pngpread.c @@ -7,8 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h - * + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h */ #include "png.h" diff --git a/pngpriv.h b/pngpriv.h index 33d1e97cb..4bce9c554 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -8,8 +8,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h - * + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h */ /* The symbols declared in this file (including the functions declared diff --git a/pngread.c b/pngread.c index f225039e6..b550be69f 100644 --- a/pngread.c +++ b/pngread.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This file contains routines that an application calls directly to * read a PNG file or stream. diff --git a/pngrio.c b/pngrio.c index b44229c4b..f9fa69e4f 100644 --- a/pngrio.c +++ b/pngrio.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This file provides a location for all input. Users who need * special handling are expected to write a function that has the same diff --git a/pngrtran.c b/pngrtran.c index f1a2b6ad1..52d8913ba 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This file contains functions optionally called by an application * in order to tell libpng how to handle data when reading a PNG. diff --git a/pngrutil.c b/pngrutil.c index 027a85a25..a26592ba7 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This file contains routines that are only called from within * libpng itself during the course of reading an image. diff --git a/pngset.c b/pngset.c index 071b02612..27e836835 100644 --- a/pngset.c +++ b/pngset.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * The functions here are used during reads to store data from the file * into the info struct, and during writes to store application data diff --git a/pngtest.c b/pngtest.c index 8f5c1b02e..be1dfaa9a 100644 --- a/pngtest.c +++ b/pngtest.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This program reads in a PNG image, writes it out again, and then * compares the two files. If the files are identical, this shows that diff --git a/pngtrans.c b/pngtrans.c index cd9730a9d..094d5b513 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -7,8 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h - * + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h */ #include "png.h" diff --git a/pngwio.c b/pngwio.c index 0e7e8d0bb..c3a099648 100644 --- a/pngwio.c +++ b/pngwio.c @@ -7,7 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h * * This file provides a location for all output. Users who need * special handling are expected to write functions that have the same diff --git a/pngwrite.c b/pngwrite.c index 6d09f75ab..87b0f06e2 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -7,8 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h - * + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h */ /* get internal access to png.h */ diff --git a/pngwtran.c b/pngwtran.c index 5fd0962bb..a69ad5086 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -7,8 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h - * + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h */ #include "png.h" diff --git a/pngwutil.c b/pngwutil.c index fa99320fa..9e90933ce 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -7,8 +7,8 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This code is released under the zlib-libpng license. - * For conditions of distribution and use, see copyright notice in png.h - * + * For conditions of distribution and use, see copyright notice, disclaimer, + * and license in png.h */ #include "png.h" diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index a2c3a667a..41adf35d9 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -4,7 +4,8 @@ project(PNG) # Copyright (C) 2007 Glenn Randers-Pehrson # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 4) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 865ca76f1..dc6021178 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -6,7 +6,8 @@ # Copyright (C) 2002 Glenn Randers-Pehrson # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Modeled after libxml-config. diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in index ed017e556..557b9c863 100755 --- a/scripts/libpng-config.in +++ b/scripts/libpng-config.in @@ -6,7 +6,8 @@ # Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Modeled after libxml-config. diff --git a/scripts/libpng.icc b/scripts/libpng.icc index c2a8862b2..a9e932f19 100644 --- a/scripts/libpng.icc +++ b/scripts/libpng.icc @@ -3,7 +3,8 @@ // Copyright (C) 2000 Cosmin Truta // // This code is released under the zlib-libpng license. -// For conditions of distribution and use, see copyright notice in png.h +// For conditions of distribution and use, see copyright notice, disclaimer, +// and license in png.h // // Notes: // All modules are compiled in C mode diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 6bbebf7ee..8626f7b3e 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -5,7 +5,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME=libpng14 diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 22e2ab099..09a9c3ee3 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -5,7 +5,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME=libpng14 diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 00f8ae497..8bb269673 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -5,7 +5,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Location of the zlib library and include files ZLIBINC = ../zlib diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index f39c5b3f3..e181b3d90 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga @@ -3,7 +3,8 @@ # Copyright (C) 1995-2000 Wolf Faust # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h # diff --git a/scripts/makefile.atari b/scripts/makefile.atari index 6a8ea63b9..1a6f6cb34 100644 --- a/scripts/makefile.atari +++ b/scripts/makefile.atari @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # modified for LC56/ATARI assumes libz.lib is in same dir and uses default # rules for library management diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ab41654e9..3408f6cbf 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -5,7 +5,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME=libpng14 diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index f65efc1df..9b3fbfa43 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -9,7 +9,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # This makefile intends to support building outside the src directory # if desired. When invoking it, specify an argument to SRCDIR on the diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 1bc3527c4..338d5815c 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -6,7 +6,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h prefix=/usr/local diff --git a/scripts/makefile.dec b/scripts/makefile.dec index ed115a4c0..35aa08f35 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: PNGMAJ = 14 diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index 1b33c4a68..539d4de9d 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # where make install will put libpng.a and png.h #prefix=/usr/local diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 3e2bd9c14..54f0c4187 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -4,7 +4,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Modified for Debian by Junichi Uekawa and Josselin Mouette # Major modifications are: diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index de0b62571..5c4fb00e3 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -2,7 +2,8 @@ # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h PREFIX?= /usr/local SHLIB_VER?= %SONUM% diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index a7c4548c6..16bdf96e0 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -4,7 +4,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Location of the zlib library and include files ZLIBINC = ../zlib diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index f84b23531..038639bf6 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -4,7 +4,8 @@ # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Where the zlib library and include files are located ZLIBLIB=/opt/zlib/lib diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index cc6976037..419e1c465 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -5,7 +5,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME = libpng14 diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index cf828ecf2..b13df0b0b 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -4,7 +4,8 @@ # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Where the zlib library and include files are located ZLIBLIB=/opt/zlib/lib diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index 4b3ecfdb3..30f7b7ce7 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -4,7 +4,8 @@ # Copyright (C) 2000 Cosmin Truta # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # Notes: # Derived from makefile.std diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 24771adfa..960a6744b 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -6,7 +6,8 @@ # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # To use, do "nmake /f scripts\makefile.intel" # diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 2ad0f88b9..977811499 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # This makefile requires the file ansi2knr.c, which you can get # from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/ diff --git a/scripts/makefile.linux b/scripts/makefile.linux index e2f8ad585..e26460900 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -4,7 +4,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME = libpng14 diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index d5d4e019c..06ca502cd 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -9,7 +9,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Built from makefile.cygwin diff --git a/scripts/makefile.mips b/scripts/makefile.mips index 6bb5f1417..dcd9f4206 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # where make install puts libpng.a and png.h prefix=/usr/local diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 9416c4e46..da1008a2b 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -3,7 +3,8 @@ # Copyright (C) 2006, 2009 Glenn Randers-Pehrson # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index b550bb823..4595f73f8 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -5,7 +5,8 @@ # Copyright (C) 2007, 2009 Glenn Randers-Pehrson # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # You should also run makefile.netbsd diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 8ed681270..dacb78ff6 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -5,7 +5,8 @@ # Copyright (C) 2007, 2009 Glenn Randers-Pehrson # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # You should also run makefile.ne0bsd diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 01599b55f..4d716d0cf 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -4,7 +4,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME = libpng14 diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index d0c95986b..ae00babc9 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -3,7 +3,8 @@ # Copyright (C) 2007-2008 Glenn Randers-Pehrson # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h PREFIX?= /usr/local LIBDIR= ${PREFIX}/lib diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index c25044547..f716c3f43 100644 --- a/scripts/makefile.os2 +++ b/scripts/makefile.os2 @@ -1,7 +1,8 @@ # makefile for libpng on OS/2 with gcc # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Related files: pngos2.def diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 515394a9c..993e68bbd 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -6,7 +6,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME = libpng14 diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 3ed864f4c..5bb26cf3f 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME=libpng14 diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index bde27c1a3..d395e6532 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME=libpng14 diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index cfb966050..0942a95cc 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -6,7 +6,8 @@ # Copyright (C) 1996-1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: PNGMAJ = 14 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index a8a9f9c0d..377cde136 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -5,7 +5,8 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # Library name: LIBNAME = libpng14 diff --git a/scripts/makefile.std b/scripts/makefile.std index b720bd603..fdb7ecf41 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # where make install puts libpng.a and png.h prefix=/usr/local diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 3711bb7d1..2bdcb6456 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -3,7 +3,8 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # where make install puts libpng.a and png.h prefix=/usr/local diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32 index f36862590..470be4753 100644 --- a/scripts/makefile.vcawin32 +++ b/scripts/makefile.vcawin32 @@ -3,7 +3,8 @@ # Copyright (C) 1998 Tim Wegner # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcawin32" diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index 9fb7caee6..e177343fe 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -3,7 +3,8 @@ # Copyright (C) 2006,2009 Glenn Randers-Pehrson # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcwin32" diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom index c54fb9720..89c0cd64d 100644 --- a/scripts/makefile.watcom +++ b/scripts/makefile.watcom @@ -5,7 +5,8 @@ # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h # To use, do "wmake /f scripts\makefile.watcom" diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc index 8e6a6130a..494540efb 100644 --- a/scripts/smakefile.ppc +++ b/scripts/smakefile.ppc @@ -3,7 +3,8 @@ # Copyright (C) 1998 by Andreas R. Kleinert # # This code is released under the zlib-libpng license. -# For conditions of distribution and use, see copyright notice in png.h +# For conditions of distribution and use, see copyright notice, disclaimer, +# and license in png.h CC = scppc CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \