Imported from libpng-1.2.4beta3.tar
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 5f54a4f..3101ecf 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.4beta2 +version=1.2.4beta3 prefix="" cppflags="" cflags=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index fc811d5..05a8d17 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@ Name: libpng12 Description: Loads and saves PNG files -Version: 1.2.4beta2 +Version: 1.2.4beta3 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 44a150a..727e577 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu
@@ -33,7 +33,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -172,9 +172,21 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index e85c02b..8df2aee 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu
@@ -33,7 +33,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -172,9 +172,21 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 00711cb..7c7d437 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix
@@ -17,7 +17,7 @@ RM = rm -f PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 9ec5aae..accda9d 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos
@@ -12,7 +12,7 @@ ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -160,9 +160,19 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + $(CC) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtesti # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 67694c0..6039746 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin
@@ -79,7 +79,7 @@ LIBNAME = libpng12 PNGMAJ = 0 PNGDLL = 13 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(PNGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index c55f817..55e9222 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin
@@ -23,7 +23,7 @@ RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -156,8 +156,19 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + $(CC) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - rm -f *.o libpng.a $(LIBNAME).*dylib pngtest pngout.png + rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + $(LIBNAME).*dylib pngtesti DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec index c3694a1..d57877e 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec
@@ -32,7 +32,7 @@ ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -140,8 +140,21 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) -std -w1 -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) -R$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e9ea46a..4d9d0c4 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -203,11 +203,14 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + test-installed: $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` pngtesti pngtest.png clean:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 218cb04..895f7cc 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc
@@ -33,7 +33,7 @@ #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -163,6 +163,22 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + +clean: + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* + clean: /bin/rm -f *.o libpng.a $(SHAREDLIB).sl $(SHAREDLIB).sl.$(PNGMAJ)* \ pngtest pngout.png
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 63cf2f7..8762163 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux
@@ -17,7 +17,7 @@ RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -148,9 +148,21 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) $(CCFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 8e24221..2c73f5f 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -175,11 +175,14 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + test-installed: $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` pngtesti pngtest.png clean:
diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 5aec5e0..cf28ccc 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx
@@ -17,7 +17,7 @@ CC=cc PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 @@ -150,8 +150,18 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + $(CC) $(CFLAGS) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -L$(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` + pngtesti pngtest.png + clean: - rm -f *.o libpng.a pngtest pngout.png \ + rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ $(LIBNAME).$(SHAREDLIB_POSTFIX)
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 9a9ca1d..0a1a241 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.4beta2 +SHLIB_MINOR= 1.2.4beta3 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 40b022b..db45711 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.4beta2 +SHLIB_MINOR= 1.2.4beta3 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 cfc89fe..569c8c7 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.4beta2 +SHLIB_MINOR= 1.2.4beta3 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 77031ed..6976f87 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco
@@ -24,7 +24,7 @@ RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 7745e18..bb17c83 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc
@@ -18,7 +18,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -165,8 +165,8 @@ test-installed: $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -rpath $(ZLIBLIB) + -L$(ZLIBLIB) -rpath $(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` echo echo Testing installed dynamic shared library. pngtesti pngtest.png
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 0380d69..94a4521 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h @@ -170,8 +170,8 @@ echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ - -L$(ZLIBLIB) -rpath $(ZLIBLIB) + -L$(ZLIBLIB) -rpath $(ZLIBLIB) \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` pngtesti pngtest.png clean:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 81b0bca..fcf16f0 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9
@@ -34,7 +34,7 @@ RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -174,10 +174,21 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock:
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index ccdc3c7..5611130 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris
@@ -30,7 +30,7 @@ RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.4beta2 +PNGMIN = 1.2.4beta3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -171,9 +171,21 @@ install: install-static install-shared install-man install-config +# If you installed in $(DESTDIR), test-installed won't work until you +# move the library to its final location. + +test-installed: + echo + echo Testing installed dynamic shared library. + $(CC) -I$(ZLIBINC) \ + `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \ + -L$(ZLIBLIB) -R$(ZLIBLIB) + pngtesti pngtest.png + clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - pngtest pngout.png + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock:
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 56d3d0b..d366a2d 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@ interface const - PNG_LIBPNG_VER_STRING = '1.2.4beta2'; + PNG_LIBPNG_VER_STRING = '1.2.4beta3'; PNG_LIBPNG_VER = 10204; type
diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 7dadb6c..a26c8af 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.4beta2 +; Version 1.2.4beta3 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2"