[libpng16] Update internal version numbering and SO-numbers

2025-07-10 18:04:09 +02:00 · 2011-11-24 14:40:36 -06:00
parent 87fadd5eee
commit 7455cbf47e
49 changed files with 336 additions and 182 deletions
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,9 +1,9 @@

-Makefiles for  libpng version 1.6.0alpha01 - November 23, 2011
+Makefiles for  libpng version 1.6.0alpha01 - November 24, 2011

 pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng15.so.15.1.6.0alpha01)
+                       (gcc, creates libpng16.so.16.1.6.0alpha01)
 makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
 makefile.knr      =>  Archaic UNIX Makefile that converts files with
                       ansi2knr (Requires ansi2knr.c from
@@ -20,7 +20,7 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.dec      =>  DEC Alpha UNIX makefile
 makefile.dj2      =>  DJGPP 2 makefile
 makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       (gcc, creates libpng15.so.15.1.6.0alpha01)
+                       (gcc, creates libpng16.so.16.1.6.0alpha01)
 makefile.freebsd  =>  FreeBSD makefile
 makefile.gcc      =>  Generic gcc makefile
 makefile.hpgcc    =>  HPUX makefile using gcc
@@ -35,12 +35,12 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
 makefile.os2      =>  OS/2 Makefile (gcc and emx, requires libpng.def)
 makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
 makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng15.so.15.1.6.0alpha01)
+                       creates libpng16.so.16.1.6.0alpha01)
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng15.so.15.1.6.0alpha01)
+                       creates libpng16.so.16.1.6.0alpha01)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng15.so.15.1.6.0alpha01)
+                       creates libpng16.so.16.1.6.0alpha01)
 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.sunos    =>  Sun makefile
 makefile.32sunu   =>  Sun Ultra 32-bit makefile
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/libpng15
+includedir=@includedir@/libpng16

 Name: libpng
 Description: Loads and saves PNG files
 Version: 1.6.0alpha01
-Libs: -L${libdir} -lpng15
+Libs: -L${libdir} -lpng16
 Cflags: -I${includedir}
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -9,8 +9,8 @@
 # and license in png.h

 # Library name:
-LIBNAME=libpng15
-PNGMAJ = 15
+LIBNAME=libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -29,7 +29,7 @@ RM_F=/bin/rm -f
 SUN_CC_FLAGS=-fast -xtarget=ultra
 SUN_LD_FLAGS=-fast -xtarget=ultra

-# where make install puts libpng.a, libpng15.so and libpng15/png.h
+# where make install puts libpng.a, libpng16.so and libpng16/png.h
 prefix=/a
 exec_prefix=$(prefix)

@@ -95,7 +95,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -106,7 +106,7 @@ libpng-config:
 	echo R_opts=\"-R$(LIBPATH)\"; \
 	echo ccopts=\"-xtarget=ultra\"; \
 	echo ldopts=\"-xtarget=ultra\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -9,8 +9,8 @@
 # and license in png.h

 # Library name:
-LIBNAME=libpng15
-PNGMAJ = 15
+LIBNAME=libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -29,7 +29,7 @@ RM_F=/bin/rm -f
 SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9

-# where make install puts libpng.a, libpng15.so and libpng15/png.h
+# where make install puts libpng.a, libpng16.so and libpng16/png.h
 prefix=/a
 exec_prefix=$(prefix)

@@ -47,7 +47,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
+LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm

 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -95,7 +95,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -106,7 +106,7 @@ libpng-config:
 	echo R_opts=\"-R$(LIBPATH)\"; \
 	echo ccopts=\"-xtarget=ultra -xarch=v9\"; \
 	echo ldopts=\"-xtarget=ultra -xarch=v9\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -21,8 +21,8 @@ RANLIB = ranlib
 RM_F = rm -f
 LN_SF = ln -f -s

-LIBNAME=libpng15
-PNGMAJ = 15
+LIBNAME=libpng16
+PNGMAJ = 16

 prefix=/usr/local
 INCPATH=$(prefix)/include
@@ -47,7 +47,7 @@ CRELEASE = -O2
 LDRELEASE = -s
 WARNMORE=-W -Wall
 CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng15 -lz -lm $(LDRELEASE)
+LDFLAGS = -L. -L$(ZLIBLIB) -lpng16 -lz -lm $(LDRELEASE)

 # File extensions
 O=.o
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -9,8 +9,8 @@
 # and license in png.h

 # Library name:
-LIBNAME=libpng15
-PNGMAJ = 15
+LIBNAME=libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -45,7 +45,7 @@ CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \
 # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
 LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz

-# where make install puts libpng.a, libpng15.so*, and png.h
+# where make install puts libpng.a, libpng16.so*, and png.h
 prefix=/usr/local
 exec_prefix=$(prefix)
 INCPATH=$(prefix)/include
@@ -91,13 +91,13 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-	echo libs=\"-lpng15 -lz \"; \
+	echo libs=\"-lpng16 -lz \"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

@@ -110,7 +110,7 @@ $(LIBSOMAJ): $(OBJSDLL)
 	$(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS)

 pngtest: pngtest.o $(LIBSO)
-	$(CC) -L$(ZLIBLIB) -L. -lz -lpng15 -o pngtest pngtest.o
+	$(CC) -L$(ZLIBLIB) -L. -lz -lpng16 -o pngtest pngtest.o

 test: pngtest
 	./pngtest
--- a/scripts/makefile.cegcc
+++ b/scripts/makefile.cegcc
@@ -28,10 +28,10 @@ VER = $(VERMAJ).$(VERMIN).$(VERMIC)
 NAME = libpng
 PACKAGE = $(NAME)-$(VER)

-BIN = libpng15-0.dll
-LIB = libpng15.a libpng15.dll.a libpng.a libpng.dll.a
+BIN = libpng16-0.dll
+LIB = libpng16.a libpng16.dll.a libpng.a libpng.dll.a
 INCLUDE = png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-PC = libpng15.pc libpng.pc
+PC = libpng16.pc libpng.pc

 MANIFESTVERBIN = "Libpng-$(VER): Binary files"
 MANIFESTVERDEV = "Libpng-$(VER): Developer files"
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -9,7 +9,7 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

-# where "make install" puts libpng.a, libpng15.dylib, png.h, pngconf.h,
+# where "make install" puts libpng.a, libpng16.dylib, png.h, pngconf.h,
 # and pnglibconf.h
 prefix=/usr/local
 exec_prefix=$(prefix)
@@ -21,8 +21,8 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).dylib
@@ -41,7 +41,7 @@ ARCH="-arch i386 -arch x86_64"

 # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops
 CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH)
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz $(ARCH)
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz $(ARCH)

 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -89,14 +89,14 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz\"; \
+	echo libs=\"-lpng16 -lz\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

@@ -106,7 +106,7 @@ $(LIBSO): $(LIBSOMAJ)
 $(LIBSOMAJ): $(OBJSDLL)
 	$(CC) -dynamiclib \
 	 -install_name $(LIBPATH)/$(LIBSOMAJ) \
-	 -current_version 15 -compatibility_version 15 \
+	 -current_version 16 -compatibility_version 16 \
 	 -o $(LIBSOMAJ) \
 	 $(OBJSDLL) -L$(ZLIBLIB) -lz

--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -7,8 +7,8 @@
 # and license in png.h

 # Library name:
-PNGMAJ = 15
-LIBNAME = libpng15
+PNGMAJ = 16
+LIBNAME = libpng16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -75,7 +75,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -83,7 +83,7 @@ libpng-config:
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-std\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -1,4 +1,4 @@
-# makefile for libpng.a and libpng15.so on Linux ELF with gcc
+# makefile for libpng.a and libpng16.so on Linux ELF with gcc
 # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs
 # and Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
@@ -10,19 +10,19 @@
 # Modified for Debian by Junichi Uekawa and Josselin Mouette
 # Major modifications are:
 #    * link libpng explicitly with libz and libm
-#    * $(OLDSO).15 is a symlink rather than a different library
+#    * $(OLDSO).16 is a symlink rather than a different library
 #    * versioned symbols

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
 LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
 LIBSOREL=$(LIBSOMAJ).$(RELEASE)
 OLDSO=libpng.so
-OLDSOMAJ=libpng.so.15
+OLDSOMAJ=libpng.so.16

 # Utilities:
 AR_RC=ar rc
@@ -32,8 +32,8 @@ LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f

-# where "make install" puts libpng15.a, libpng15.so*,
-# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h
+# where "make install" puts libpng16.a, libpng16.so*,
+# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h
 # Prefix must be a full pathname.
 prefix=/usr/local
 exec_prefix=$(prefix)
@@ -57,7 +57,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 CFLAGS=-W -Wall -D_REENTRANT -O2 \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5

-LDFLAGS=-L. -lpng15
+LDFLAGS=-L. -lpng16
 LDFLAGS_A=libpng.a -lz -lm
 LIBADDFLAGS=-lz -lm

@@ -108,11 +108,11 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng.syms: png.h pngconf.h pnglibconf.h
 	$(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\
-	awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG15_%s {global:\n",PNGMAJ)}\
+	awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG16_%s {global:\n",PNGMAJ)}\
 	{ for (i=1;i+2<=NF;++i)\
 		if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\
 			print $$(i+1) ";";\
@@ -129,8 +129,8 @@ libpng-config:
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo L_opts=\"\"; \
 	echo R_opts=\"\"; \
-	echo libs=\"-lpng15\"; \
-	echo all_libs=\"-lpng15 $(LIBADDFLAGS)\"; \
+	echo libs=\"-lpng16\"; \
+	echo all_libs=\"-lpng16 $(LIBADDFLAGS)\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -6,7 +6,7 @@
 # and license in png.h

 PREFIX?=        /usr/local
-SHLIB_VER?=     15
+SHLIB_VER?=     16

 LIB=		png
 SHLIB_MAJOR=	${SHLIB_VER}
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -19,8 +19,8 @@ ZLIBINC=/opt/zlib/include
 #   SHAREDLIB=libz.sl

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).sl
@@ -44,7 +44,7 @@ CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \

 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm

-# where make install puts libpng.a, libpng15.sl, and png.h
+# where make install puts libpng.a, libpng16.sl, and png.h
 prefix=/opt/libpng
 exec_prefix=$(prefix)
 INCPATH=$(prefix)/include
@@ -93,7 +93,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -101,7 +101,7 @@ libpng-config:
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -9,8 +9,8 @@
 # and license in png.h

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).sl
@@ -55,8 +55,8 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \

 CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm
+#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm

 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -100,13 +100,13 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
 	echo prefix=\"$(prefix)\"; \
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -19,8 +19,8 @@ ZLIBINC=/opt/zlib/include
 #   SHAREDLIB=libz.sl

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).sl
@@ -36,7 +36,7 @@ LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f

-# where make install puts libpng.a, libpng15.sl, and png.h
+# where make install puts libpng.a, libpng16.sl, and png.h
 prefix=/opt/libpng
 exec_prefix=$(prefix)
 INCPATH=$(prefix)/include
@@ -90,7 +90,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -98,7 +98,7 @@ libpng-config:
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -1,4 +1,4 @@
-# makefile for libpng.a and libpng15.so on Linux ELF with gcc
+# makefile for libpng.a and libpng16.so on Linux ELF with gcc
 # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
@@ -8,8 +8,8 @@
 # and license in png.h

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16
 RELEASE = 0

 # Shared library names:
@@ -26,8 +26,8 @@ LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f

-# where "make install" puts libpng15.a, libpng15.so*,
-# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h
+# where "make install" puts libpng16.a, libpng16.so*,
+# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h
 # Prefix must be a full pathname.
 prefix=/usr/local
 exec_prefix=$(prefix)
@@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5

-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm
+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm
 LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm

 INCPATH=$(prefix)/include
@@ -100,7 +100,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -108,7 +108,7 @@ libpng-config:
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,9 +13,9 @@
 LOCALBASE?=/usr/local
 LIBDIR=	${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man
-INCSDIR=${LOCALBASE}/include/libpng15
+INCSDIR=${LOCALBASE}/include/libpng16

-LIB=	png15
+LIB=	png16
 SHLIB_MAJOR=	0
 SHLIB_MINOR=	1.6.0alpha01
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -8,7 +8,7 @@
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h

-# You should also run makefile.ne15bsd
+# You should also run makefile.ne16bsd

 LOCALBASE?=/usr/local
 LIBDIR=	${LOCALBASE}/lib
@@ -16,7 +16,7 @@ MANDIR= ${LOCALBASE}/man
 INCSDIR=${LOCALBASE}/include

 LIB=	png
-SHLIB_MAJOR=	15
+SHLIB_MAJOR=	16
 SHLIB_MINOR=	1.6.0alpha01
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -10,7 +10,7 @@ PREFIX?= /usr/local
 LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

-SHLIB_MAJOR=	15
+SHLIB_MAJOR=	16
 SHLIB_MINOR=	1.6.0alpha01

 LIB=	png
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -10,8 +10,8 @@
 # and license in png.h

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -38,7 +38,7 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib

 CFLAGS= -dy -belf -I$(ZLIBINC) -O3
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng15 -lz -lm
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm

 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -86,7 +86,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -94,7 +94,7 @@ libpng-config:
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo ccopts=\"-belf\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -1,4 +1,4 @@
-# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
+# makefile for libpng.a and libpng16.so, SGI IRIX with 'cc'
 # Copyright (C) 2001-2002, 2006, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
@@ -7,8 +7,8 @@
 # and license in png.h

 # Library name:
-LIBNAME=libpng15
-PNGMAJ = 15
+LIBNAME=libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -24,7 +24,7 @@ LN_SF=ln -sf
 RANLIB=echo
 RM_F=/bin/rm -f

-# Where make install puts libpng.a, libpng15.so, and libpng15/png.h
+# Where make install puts libpng.a, libpng16.so, and libpng16/png.h
 # Prefix must be a full pathname.

 prefix=/usr/local
@@ -91,7 +91,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -102,7 +102,7 @@ libpng-config:
 	echo ldopts=\"$(ABI)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo libdir=\"$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -1,4 +1,4 @@
-# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
+# makefile for libpng.a and libpng16.so, SGI IRIX with 'cc'
 # Copyright (C) 2001-2002, 2006, 2007, 2010-2011 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
@@ -7,8 +7,8 @@
 # and license in png.h

 # Library name:
-LIBNAME=libpng15
-PNGMAJ = 15
+LIBNAME=libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -24,7 +24,7 @@ LN_SF=ln -sf
 RANLIB=echo
 RM_F=/bin/rm -f

-# Where make install puts libpng.a, libpng15.so, and libpng15/png.h
+# Where make install puts libpng.a, libpng16.so, and libpng16/png.h
 # Prefix must be a full pathname.

 prefix=/usr/local
@@ -46,7 +46,7 @@ WARNMORE=-fullwarn
 # Note: -KPIC is the default anyhow
 #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5
 CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE)
-LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng15 -lz -lm
+LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng16 -lz -lm
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
 	-set_version sgi$(PNGMAJ).0
@@ -92,7 +92,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -102,7 +102,7 @@ libpng-config:
 	echo ldopts=\"$(ABI)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo libdir=\"$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -10,8 +10,8 @@
 # and license in png.h

 # Library name:
-PNGMAJ = 15
-LIBNAME = libpng15
+PNGMAJ = 16
+LIBNAME = libpng16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -48,7 +48,7 @@ ZLIBINC=/usr/include
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 #CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE
 CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
+LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm

 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -96,7 +96,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -104,7 +104,7 @@ libpng-config:
 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -9,8 +9,8 @@
 # and license in png.h

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -26,7 +26,7 @@ LN_SF=ln -f -s
 RANLIB=echo
 RM_F=/bin/rm -f

-# Where make install puts libpng.a, libpng15.so*, and png.h
+# Where make install puts libpng.a, libpng16.so*, and png.h
 prefix=/usr/local
 exec_prefix=$(prefix)

@@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) -W -Wall -O \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
+LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm

 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -92,7 +92,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -101,7 +101,7 @@ libpng-config:
 	echo cppflags=\"\"; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -9,8 +9,8 @@
 # and license in png.h

 # Library name:
-LIBNAME = libpng15
-PNGMAJ = 15
+LIBNAME = libpng16
+PNGMAJ = 16

 # Shared library names:
 LIBSO=$(LIBNAME).so
@@ -26,7 +26,7 @@ LN_SF=ln -f -s
 RANLIB=echo
 RM_F=/bin/rm -f

-# Where make install puts libpng.a, libpng15.so*, and png.h
+# Where make install puts libpng.a, libpng16.so*, and png.h
 prefix=/usr/local
 exec_prefix=$(prefix)

@@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) -W -Wall -O \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng15 -lz -lm
+LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm

 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -92,7 +92,7 @@ libpng.pc:
 	-e s!@exec_prefix@!$(exec_prefix)! \
 	-e s!@libdir@!$(LIBPATH)! \
 	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
+	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc

 libpng-config:
 	( cat scripts/libpng-config-head.in; \
@@ -101,7 +101,7 @@ libpng-config:
 	echo cppflags=\""; \
 	echo L_opts=\"-L$(LIBPATH)\"; \
 	echo R_opts=\"-R$(LIBPATH)\"; \
-	echo libs=\"-lpng15 -lz -lm\"; \
+	echo libs=\"-lpng16 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@

 /* pnglibconf.h - library build configuration */

-/* Libpng 1.6.0alpha01 - November 23, 2011 */
+/* Libpng 1.6.0alpha01 - November 24, 2011 */

 /* Copyright (c) 1998-2011 Glenn Randers-Pehrson */