Imported from libpng-1.2.1rc1.tar

2025-07-10 18:04:09 +02:00 · 2001-11-24 14:53:31 -06:00
parent 5cded0b4b5
commit ae498dcff3
55 changed files with 151 additions and 127 deletions
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@ RM = rm -f
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local
@@ -63,7 +63,7 @@ install: libpng.a
 	cp libpng.a $(LIBPATH)

 clean:
-	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
+	/bin/rm -f *.o libpng.a pngtest pngout.png

 png$(O): png.h pngconf.h
 pngerror$(O): png.h pngconf.h
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -13,7 +13,7 @@ ZLIBINC=/usr/local/include
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=
@@ -82,7 +82,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	 ln -sf libpng.so.$(PNGMAJ) libpng.so)

 clean:
-	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png

 # DO NOT DELETE THIS LINE -- make depend depends on it.

--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -39,7 +39,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
 # have to change it.
 PNGMAJ = 3
 #PNGDLL = $3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGMIN_BASE = 1.2.1
 PNGVER = $(PNGMAJ).$(PNGMIN)

--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -24,7 +24,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -17,7 +17,7 @@ ZLIBINC=../zlib
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=cc
@@ -68,7 +68,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	 ln -f -s libpng.so.$(PNGMAJ) libpng.so)

 clean:
-	rm -f *.o libpng.a pngtest pngout.png libpng.so*
+	/bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png

 # DO NOT DELETE THIS LINE -- make depend depends on it.

--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -55,7 +55,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -122,7 +122,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	 ln -sf libpng.so.$(PNGMAJ) libpng.so)

 clean:
-	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -85,7 +85,7 @@ install: libpng.a libpng.sl.$(PNGVER)
 	 ln -sf libpng.sl.$(PNGMAJ) libpng.sl)

 clean:
-	/bin/rm -f *.o libpng.a libpng.sl* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.sl libpng.sl.$(PNGMAJ)* pngtest pngout.png

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -19,7 +19,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # where make install puts libpng.a and png.h
@@ -72,7 +72,7 @@ install: libpng.a
 	ln -f -s libpng.sl.$(PNGMAJ) libpng.sl)

 clean:
-	rm -f *.o libpng.a libpng.sl* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.sl libpng.sl.$(PNGMAJ)* pngtest pngout.png

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -85,7 +85,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	 ln -sf libpng.so.$(PNGMAJ) libpng.so)

 clean:
-	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -19,7 +19,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
 LDSHARED=cc -lz -dynamiclib -compatibility_version $(VER) -current_version $(VER)

 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 VER = $(PNGMAJ).$(PNGMIN)
 SHAREDLIB=libpng
 SHAREDLIB_POSTFIX=dylib
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -11,7 +11,7 @@ INCSDIR=${LOCALBASE}/include

 LIB=png
 SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.1beta4
+SHLIB_MINOR= 1.2.1rc1
 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
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -75,7 +75,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	 ln -f -s libpng.so.$(PNGMAJ) libpng.so)

 clean:
-	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -22,7 +22,7 @@ CFLAGS=$(ABI) -I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=CC $(ABI) -shared

-VER=1.2.1beta4
+VER=1.2.1rc1
 # See "man dso" for info about shared objects
 SONUM=3
 LIBS=libpng.so.$(SONUM).$(VER)
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -27,16 +27,18 @@ CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=cc $(ABI) -shared

-VER=1.2.1beta4
+VER=1.2.1rc1
 # See "man dso" for info about shared objects
 SONUM=3
 SHAREDLIB=libpng.so
-libdir=$(prefix)
-#libdir=$(prefix)/lib32

 RANLIB=echo
 #RANLIB=ranlib

+INCPATH=$(prefix)/include
+LIBPATH=$(prefix)/lib
+#LIBPATH=$(prefix)/lib32
+
 OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
 	pngwtran.o pngmem.o pngerror.o pngpread.o
@@ -51,7 +53,7 @@ libpng.a: $(OBJS)

 $(SHAREDLIB).$(SONUM).$(VER): $(OBJS)
 	$(LDSHARED) -o $@ $(OBJS)
-	rm -f $(SHAREDLIB) $(SHAREDLIB).?
+	rm -f $(SHAREDLIB) $(SHAREDLIB).$(SONUM)
 	ln -s $@ $(SHAREDLIB)
 	ln -s $@ $(SHAREDLIB).$(SONUM)

@@ -62,25 +64,25 @@ test: pngtest
 	./pngtest

 install: libpng.a
-	-@mkdir $(prefix)/include
-	-@mkdir $(prefix)/lib
-	cp png.h $(prefix)/include
-	cp pngconf.h $(prefix)/include
-	chmod 644 $(prefix)/include/png.h
-	chmod 644 $(prefix)/include/pngconf.h
-	cp libpng.a $(prefix)/lib
-	chmod 644 $(prefix)/lib/libpng.a
+	-@mkdir $(INCPATH)
+	-@mkdir $(LIBPATH)
+	cp png.h $(INCPATH)
+	cp pngconf.h $(INCPATH)
+	chmod 644 $(INCPATH)/png.h
+	chmod 644 $(INCPATH)/pngconf.h
+	cp libpng.a $(LIBPATH)
+	chmod 644 $(LIBPATH)/libpng.a

 install-shared: $(SHAREDLIB).$(SONUM).$(VER)
-	cp $(SHAREDLIB).$(SONUM).$(VER) $(libdir)
+	cp $(SHAREDLIB).$(SONUM).$(VER) $(LIBPATH)
 	chmod 755 $(SHAREDLIB).$(SONUM).$(VER)
-	(cd $(libdir); if test -f $(SHAREDLIB).$(SONUM).$(VER); then \
+	(cd $(LIBPATH); if test -f $(SHAREDLIB).$(SONUM).$(VER); then \
 	rm -f $(SHAREDLIB) $(SHAREDLIB).$(SONUM); \
 	ln -s $(SHAREDLIB).$(SONUM).$(VER) $(SHAREDLIB).$(SONUM); \
 	ln -s $(SHAREDLIB).$(SONUM) $(SHAREDLIB))

 clean:
-	rm -f *.o libpng.a pngtest pngout.png $(SHAREDLIB).*
+	rm -f *.o libpng.a pngtest pngout.png $(SHAREDLIB) $(SHAREDLIB).$(SONUM)*

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -35,7 +35,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -97,7 +97,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	 ln -f -s libpng.so.$(PNGMAJ) libpng.so)

 clean:
-	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 3.  You should not
 # have to change it.
 PNGMAJ = 3
-PNGMIN = 1.2.1beta4
+PNGMIN = 1.2.1rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -93,7 +93,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	 ln -f -s libpng.so.$(PNGMAJ) libpng.so)

 clean:
-	/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
+	/bin/rm -f *.o libpng.a libpng.so libpng.so.$(PNGMAJ)* pngtest pngout.png

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@ unit pngdef;
 interface

 const
-  PNG_LIBPNG_VER_STRING = '1.2.1beta4';
+  PNG_LIBPNG_VER_STRING = '1.2.1rc1';
  PNG_LIBPNG_VER        =  10201;

 type
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.2.1beta4
+; Version 1.2.1rc1

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"