Imported from libpng-1.2.6beta2.tarv1.2.6beta2

34 files changed, 155 insertions, 114 deletions

diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in
index b466432d5..5267c1a1b 100755
--- a/scripts/libpng-config-body.in
+++ b/scripts/libpng-config-body.in
@@ -77,6 +77,10 @@ while test $# -gt 0; do
         echo ${R_opts}
         ;;
 
+    --ldopts)
+        echo ${ldopts}
+        ;;
+
     --ldflags)
         echo ${ldflags} ${L_opts} ${R_opts} ${libs}
         ;;
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 50749e775..f7a5810c8 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
 
 # Modeled after libxml-config.
 
-version=1.2.6beta1
+version=1.2.6beta2
 prefix=""
 libdir=""
 libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 864d019d4..f50823384 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
 
 Name: libpng12
 Description: Loads and saves PNG files
-Version: 1.2.6beta1
+Version: 1.2.6beta2
 Libs: -L${libdir} -lpng12 -lz -lm
 Cflags: -I${includedir}/libpng12
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index bfc2405fe..804209cbb 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,6 +8,10 @@
 CC=cc
 SUN_CC_FLAGS=-fast -xtarget=ultra
 SUN_LD_FLAGS=-fast -xtarget=ultra
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
 
 # where make install puts libpng.a, libpng12.so and libpng12/png.h
 prefix=/a
@@ -28,12 +32,9 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
 
-#RANLIB=ranlib
-RANLIB=echo
-
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -70,7 +71,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 9605cad43..283b22838 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,6 +8,10 @@
 CC=cc
 SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
 
 # where make install puts libpng.a, libpng12.so and libpng12/png.h
 prefix=/a
@@ -28,12 +32,9 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
 
-#RANLIB=ranlib
-RANLIB=echo
-
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -70,7 +71,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 5f7330a83..15c1477c4 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -12,13 +12,14 @@ ZLIBLIB = ../zlib
 # Compiler, linker, lib and other tools
 CC = gcc
 LD = $(CC)
-AR = ar rcs
+AR=ar
+ARFLAGS=rcs
 RANLIB = ranlib
 RM = rm -f
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local
@@ -60,7 +61,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
 all: $(LIBNAME)$(A) pngtest$(E)
 
 $(LIBNAME)$(A): $(OBJS)
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 test: pngtest$(E)
diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga
index 79cb42499..c210973ce 100644
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@@ -9,6 +9,16 @@
 ZLIB=/zlib
 #compiler
 CC=sc
+# linker
+LN= slink
+# file deletion command
+RM= delete quiet
+# library (.lib) file creation command
+AR= oml
+ARFLAGS=
+# make directory command
+MKDIR= makedir
+
 #compiler flags
 # WARNING: a bug in V6.51 causes bad code with OPTGO
 #          So use V6.55 or set NOOPTGO!!!!!!!!!
@@ -19,14 +29,6 @@ CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\
 LDFLAGS= SD ND BATCH
 #link libs
 LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib
-# linker
-LN= slink
-# file deletion command
-RM= delete quiet
-# library (.lib) file creation command
-AR= oml
-# make directory command
-MKDIR= makedir
 
 OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
@@ -36,7 +38,7 @@ all: libpng.lib pngtest
 
 libpng.lib: $(OBJS)
 -$(RM) libpng.lib
-$(AR) libpng.lib r $(OBJS)
+$(AR) $(ARFLAGS) libpng.lib r $(OBJS)
 
 pngtest: pngtest.o libpng.lib
 $(LN) <WITH <
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 6a6d7054e..a59c371f1 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -6,13 +6,17 @@
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
 
 # Where the zlib library and include files are located
 ZLIBLIB=/usr/local/lib
 ZLIBINC=/usr/local/include
 
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 ALIGN=
@@ -28,9 +32,6 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 
-RANLIB=ranlib
-#RANLIB=echo
-
 # where make install puts libpng.a, libpng12.so*, and png.h
 prefix=/usr/local
 INCPATH=$(prefix)/include
@@ -66,7 +67,7 @@ OBJSDLL = $(OBJS)
 all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index c3c6f0ce4..4bf80c0e3 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -36,6 +36,12 @@ DESTDIR=
 # list at the bottom of this makefile.
 
 CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
+MKDIR=/bin/mkdir -pv
+
 ifdef MINGW
 MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
 MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
@@ -79,7 +85,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(CYGDLL).dll
@@ -93,10 +99,6 @@ LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)
 LDSFLAGS=$(strip -shared -L.  $(MINGW_LDFLAGS) -Wl,--export-all)
 LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
 
-MKDIR=/bin/mkdir -pv
-RANLIB=ranlib
-#RANLIB=echo
-
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 
@@ -173,7 +175,7 @@ pnggccrd.pic.o:	pnggccrd.c png.h pngconf.h
 	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
 
 $(STATLIB): $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 $(SHAREDDEF): projects/msvc/png32ms.def
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index d067082e7..26a9986a3 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -16,14 +16,16 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 CC=cc
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
-
+AR=ar
+ARFLAGS=rc
 #RANLIB=echo
 RANLIB=ranlib
 
+CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
+
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -61,7 +63,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 52f7b9317..aa1a67ef3 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -32,17 +32,19 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
 CC=cc
-CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
-LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm
-
+AR=ar
+ARFLAGS=rc
 #RANLIB=echo
 RANLIB=ranlib
 
+CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
+LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -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
@@ -50,7 +52,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: $(LIBNAME).so libpng.a pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
+	$(AR) $(ARFLAGS) $@  $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index 09045c275..5ccb4ae2f 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -10,6 +10,8 @@ INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 
 CC=gcc
+AR=ar
+ARFLAGS=rc
 CFLAGS=-I../zlib -O
 LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
 
@@ -22,7 +24,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
+	$(AR) $(ARFLAGS) $@  $(OBJS)
 	$(RANLIB) $@
 
 pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index f7fc36874..52a77f3c7 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -10,7 +10,8 @@ ZLIBLIB = ../zlib
 # Compiler, linker, lib and other tools
 CC = gcc
 LD = $(CC)
-AR = ar rcs
+AR=ar
+ARFLAGS=rcs
 RANLIB = ranlib
 RM = rm -f
 
@@ -35,7 +36,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
 all: libpng$(A) pngtest$(E)
 
 libpng$(A): $(OBJS)
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 test: pngtest$(E)
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 09d13fff0..899d10475 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,10 +15,14 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
 
 # where "make install" puts libpng12.a, libpng12.so*,
 # libpng12/png.h and libpng12/pngconf.h
@@ -58,9 +62,6 @@ CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
 LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
 
-RANLIB=ranlib
-#RANLIB=echo
-
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
@@ -95,7 +96,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index ac7b5177a..4d0e60f64 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -6,7 +6,11 @@
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=gcc
+AR=ar
+ARFLAGS=rc
 LD=ld
+RANLIB=ranlib
+#RANLIB=echo
 
 # where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h
 prefix=/usr/local
@@ -37,11 +41,8 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
 #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
 LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm
 
-RANLIB=ranlib
-#RANLIB=echo
-
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -79,7 +80,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index e9235ba4a..b9a5ec764 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -16,15 +16,17 @@ ZLIBINC=/opt/zlib/include
 #   SHAREDLIB=libz.sl
 
 CC=cc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+
 CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
 # Caution: be sure you have built zlib with the same CFLAGS.
 CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
 LDFLAGS=-L$(ZLIBLIB) libpng.a -lz -lm
 
-RANLIB=ranlib
-
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -64,7 +66,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index f09a62c9e..1a6030f98 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -16,6 +16,7 @@ ZLIBLIB = ../zlib
 CC = icc
 LD = ilink
 AR = ilib
+ARFLAGS=
 RM = del
 
 CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3
@@ -37,7 +38,7 @@ LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A)
 all: libpng$(A) pngtest$(E)
 
 libpng$(A): $(OBJS)
-	$(AR) -out:$@ $(OBJS)
+	$(AR) $(ARFLAGS) -out:$@ $(OBJS)
 
 test: pngtest$(E)
 	pngtest$(E)
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 44ee538a3..463efca15 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -24,6 +24,8 @@ LIBPATH=$(prefix)/lib
 DESTDIR=
 
 CC=cc
+AR=ar
+ARFLAGS=rc
 CFLAGS=-I../zlib -O
 LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
 # flags for ansi2knr
@@ -49,7 +51,7 @@ ansi2knr: ansi2knr.c
 	$(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr ansi2knr.c
 
 libpng.a: ansi2knr $(OBJS)
-	ar rc $@  $(OBJS)
+	$(AR) $(ARFLAGS) $@  $(OBJS)
 	$(RANLIB) $@
 
 pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index b15a5bfa3..4ef78987a 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,10 +5,14 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
 
 # where "make install" puts libpng12.a, libpng12.so*,
 # libpng12/png.h and libpng12/pngconf.h
@@ -37,9 +41,6 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
 LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
 
-RANLIB=ranlib
-#RANLIB=echo
-
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 MANPATH=$(prefix)/man
@@ -74,7 +75,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx
index 6f98e2972..87c3541fc 100644
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -15,9 +15,13 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 CC=cc
+AR=ar
+ARFLAGS=rc
+#RANLIB=echo
+RANLIB=ranlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
@@ -45,9 +49,6 @@ DI=$(DESTDIR)$(INCPATH)
 DL=$(DESTDIR)$(LIBPATH)
 DM=$(DESTDIR)$(MANPATH)
 
-#RANLIB=echo
-RANLIB=ranlib
-
 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
@@ -70,7 +71,7 @@ libpng-config:
 	chmod +x libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
+	$(AR) $(ARFLAGS) $@  $(OBJS)
 	$(RANLIB) $@
 
 $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX): $(OBJS)
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index f1a557df7..4501d1e7d 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -19,6 +19,8 @@ LIBPATH=$(prefix)/lib
 DESTDIR=
 
 CC=cc
+AR=ar
+ARFLAGS=rc
 CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips
 #CFLAGS=-O
 LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
@@ -33,7 +35,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
+	$(AR) $(ARFLAGS) $@  $(OBJS)
 	$(RANLIB) $@
 
 pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index f3d1f1fda..5b9fbcee3 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
 
 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.6beta1
+SHLIB_MINOR=	1.2.6beta2
 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 \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index dd5a31f26..36c73f0d8 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
 
 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.6beta1
+SHLIB_MINOR=	1.2.6beta2
 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 \
 		pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 2cf476f82..e81fe13ef 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.6beta1
+SHLIB_MINOR=	1.2.6beta2
 
 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.os2 b/scripts/makefile.os2
index 588067d25..800428e84 100644
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@@ -16,6 +16,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O6 -funroll-loops -malign-loops=2 \
 	-malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll
 AR=emxomfar
+ARFLAGS=rc
 
 PNGLIB=png.lib
 IMPLIB=emximp
@@ -31,7 +32,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
 
 $(PNGLIB): $(OBJS)
-	$(AR) rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 
 $(SHAREDLIB): $(OBJS) pngos2.def
 	$(CC) $(LDFLAGS) -Zdll -o $@ $^
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index b2c9f0dba..0ff683931 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -7,6 +7,10 @@
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=cc
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
 
 # where make install puts libpng.a, libpng.so*, and png.h
 prefix=/usr/local
@@ -20,11 +24,8 @@ ZLIBINC=../zlib
 CFLAGS= -dy -belf -I$(ZLIBINC) -O3
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 
-#RANLIB=ranlib
-RANLIB=echo
-
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -62,7 +63,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 85e4dc852..b48147a4e 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -18,9 +18,14 @@ ZLIBINC=../zlib
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
+
 CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=echo
+#RANLIB=ranlib
 
 # ABI can be blank to use default for your system, -32, -o32, -n32, or -64
 # See "man abi".  zlib must be built with the same ABI.
@@ -35,9 +40,6 @@ LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \
   -set_version sgi$3.0
 # See "man dso" for info about shared objects
 
-RANLIB=echo
-#RANLIB=ranlib
-
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 #LIBPATH=$(prefix)/lib32
@@ -66,7 +68,7 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest shared libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 shared: $(LIBNAME).so.$(PNGVER)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 385d16691..f556d1480 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Where make install puts libpng.a, libpng12.so, and libpng12/png.h
@@ -22,6 +22,10 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 CC=cc
+AR=ar
+ARFLAGS=rc
+RANLIB=echo
+#RANLIB=ranlib
 
 # ABI can be blank to use default for your system, -32, -o32, -n32, or -64
 # See "man abi".  zlib must be built with the same ABI.
@@ -40,9 +44,6 @@ LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \
   -set_version sgi$3.0
 # See "man dso" for info about shared objects
 
-RANLIB=echo
-#RANLIB=ranlib
-
 INCPATH=$(prefix)/include
 LIBPATH=$(prefix)/lib
 #LIBPATH=$(prefix)/lib32
@@ -71,7 +72,7 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest shared libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 shared: $(LIBNAME).so.$(PNGVER)
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 731ad514c..999ace4f5 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,6 +8,10 @@
 
 # gcc 2.95 doesn't work.
 CC=cc
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
 
 # Where make install puts libpng.a, libpng.so*, and png.h
 prefix=/usr/local
@@ -30,11 +34,8 @@ ZLIBINC=/usr/include
 CFLAGS=-I$(ZLIBINC) -O3
 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 
-#RANLIB=ranlib
-RANLIB=echo
-
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -72,7 +73,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 4a7e585fc..63d943381 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -6,6 +6,10 @@
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=gcc
+AR=ar
+ARFLAGS=rc
+#RANLIB=ranlib
+RANLIB=echo
 
 # Where make install puts libpng.a, libpng12.so*, and png.h
 prefix=/usr/local
@@ -26,11 +30,8 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 \
 	# $(WARNMORE) -g -DPNG_DEBUG=5
 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 
-#RANLIB=ranlib
-RANLIB=echo
-
 PNGMAJ = 0
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -68,7 +69,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-	ar rc $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 libpng.pc:
diff --git a/scripts/makefile.std b/scripts/makefile.std
index 5d1f5290d..e9fb76ecd 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -25,12 +25,14 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 CC=cc
-CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-
+AR=ar
+ARFLAGS=rc
 #RANLIB=echo
 RANLIB=ranlib
 
+CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
+LDFLAGS=-L. -L$(ZLIBLIB) -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
@@ -38,7 +40,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
+	$(AR) $(ARFLAGS) $@  $(OBJS)
 	$(RANLIB) $@
 
 pngtest: pngtest.o libpng.a
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index 70a6e88af..77c8ad719 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -29,12 +29,14 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \
 	-Wmissing-declarations -Wtraditional -Wcast-align \
 	-Wstrict-prototypes -Wmissing-prototypes
 CC=gcc
-CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-
+AR=ar
+ARFLAGS=rc
 RANLIB=ranlib
 #RANLIB=echo
 
+CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5
+LDFLAGS=-L. -L$(ZLIBLIB) -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
@@ -42,7 +44,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
+	$(AR) $(ARFLAGS) $@  $(OBJS)
 	$(RANLIB) $@
 
 pngtest: pngtest.o libpng.a
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index d49174181..14d68ca00 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@ unit pngdef;
 interface
 
 const
-  PNG_LIBPNG_VER_STRING = '1.2.6beta1';
+  PNG_LIBPNG_VER_STRING = '1.2.6beta2';
   PNG_LIBPNG_VER        =  10206;
 
 type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index ead951892..6c647977b 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.6beta1
+; Version 1.2.6beta2
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"