This commit was generated by cvs2svn to compensate for changes in r28944,

which included commits to RCS files with non-trunk default branches.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/png/pngtest.png b/src/png/pngtest.png
index f3a6df4483fc9d020c028d4e4f417767bfa72877..ebea081c56302df0c23fb3a8224d48d9a5d29101 100644 (file)
Binary files a/src/png/pngtest.png and b/src/png/pngtest.png differ

diff --git a/src/png/projects/netware.txt b/src/png/projects/netware.txt
index 2719c997d90bbc4c3fb4417cd0cab26cdb4714d5..178361da8fca1ef72b4490aa4b50d484a1ab204c 100644 (file)
--- a/src/png/projects/netware.txt
+++ b/src/png/projects/netware.txt
@@ -1,6 +1,6 @@
 A set of project files is available for Netware.  Get
-libpng-1.2.4-project-netware.zip from a libpng distribution
+libpng-1.2.5-project-netware.zip from a libpng distribution
 site such as http://libpng.sourceforge.net
 
 Put the zip file in this directory (projects) and then run
-"unzip -a libpng-1.2.4-project-netware.zip"
+"unzip -a libpng-1.2.5-project-netware.zip"

diff --git a/src/png/projects/wince.txt b/src/png/projects/wince.txt
index d7e99b1c55c04a3f85395204719cfacb2353dda9..a1a26c0bc68fc1808788a11747cdbd3d355ed1e4 100644 (file)
--- a/src/png/projects/wince.txt
+++ b/src/png/projects/wince.txt
@@ -1,6 +1,6 @@
 A set of project files is available for WinCE.  Get
-libpng-1.2.4-project-wince.zip from a libpng distribution
+libpng-1.2.5-project-wince.zip from a libpng distribution
 site such as http://libpng.sourceforge.net
 
 Put the zip file in this directory (projects) and then run
-"unzip -a libpng-1.2.4-project-wince.zip"
+"unzip -a libpng-1.2.5-project-wince.zip"

diff --git a/src/png/scripts/libpng-config-body.in b/src/png/scripts/libpng-config-body.in
index 8995df879bf40d0028fa37e1a591128c9a94bff9..b466432d54642032a192cee519fc15e35022ff4c 100755 (executable)
--- a/src/png/scripts/libpng-config-body.in
+++ b/src/png/scripts/libpng-config-body.in
@@ -6,14 +6,20 @@ Usage: libpng-config [OPTION] ...
 
 Known values for OPTION are:
 
-  --prefix              print libpng prefix
-  --libs                print library linking information
-  --cflags              print compiler flags
-  --cppflags            print pre-processor flags
-  --ldflags             print loader flags
-  --rpath               print path to shared library
-  --help                display this help and exit
-  --version             output version information
+  --prefix        print libpng prefix
+  --libdir        print path to directory containing library
+  --libs          print library linking information
+  --ccopts        print compiler options
+  --cppflags      print pre-processor flags
+  --cflags        print preprocessor flags, I_opts, and compiler options
+  --I_opts        print "-I" include options
+  --L_opts        print linker "-L" flags for dynamic linking
+  --R_opts        print dynamic linker "-R" or "-rpath" flags
+  --ldopts        print linker options
+  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)
+  --static        revise subsequent outputs for static linking
+  --help          print this help and exit
+  --version       print version information
 EOF
 
     exit $1
@@ -39,24 +45,44 @@ while test $# -gt 0; do
         usage 0
         ;;
 
-    --cflags)
-        echo ${cflags}
+    --ccopts)
+        echo ${ccopts}
         ;;
 
     --cppflags)
         echo ${cppflags}
         ;;
 
+    --cflags)
+        echo ${I_opts} ${cppflags} ${ccopts}
+        ;;
+
+    --libdir)
+        echo ${libdir}
+        ;;
+
     --libs)
         echo ${libs}
         ;;
 
-    --rpath)
-        echo ${rpath}
+    --I_opts)
+        echo ${I_opts}
+        ;;
+
+    --L_opts)
+        echo ${L_opts}
+        ;;
+
+    --R_opts)
+        echo ${R_opts}
         ;;
 
     --ldflags)
-        echo ${ldflags}
+        echo ${ldflags} ${L_opts} ${R_opts} ${libs}
+        ;;
+
+    --static)
+        R_opts=""
         ;;
 
     *)

diff --git a/src/png/scripts/libpng-config-head.in b/src/png/scripts/libpng-config-head.in
index 7a321a74c9f6ee9f45a696809e90f7b82807dbf0..1e0766f38c8ecdbc0e0c364cdfdd0900cf068ade 100755 (executable)
--- a/src/png/scripts/libpng-config-head.in
+++ b/src/png/scripts/libpng-config-head.in
@@ -8,11 +8,14 @@
 
 # Modeled after libxml-config.
 
-version=1.2.4
+version=1.2.6
 prefix=""
-cppflags=""
-cflags=""
-ldflags=""
+libdir=""
 libs=""
-rpath=""
+I_opts=""
+L_opts=""
+R_opts=""
+cppflags=""
+ccopts=""
+ldopts=""
 

diff --git a/src/png/scripts/libpng.pc.in b/src/png/scripts/libpng.pc.in
index 7f91cfcb329f7362fda2446cdc70383181d0488c..4d4f0b7321307c110658738c1191b5537077c407 100644 (file)
--- a/src/png/scripts/libpng.pc.in
+++ b/src/png/scripts/libpng.pc.in
@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
 
 Name: libpng12
 Description: Loads and saves PNG files
-Version: 1.2.4
+Version: 1.2.6
 Libs: -L${libdir} -lpng12 -lz -lm
 Cflags: -I${includedir}/libpng12

diff --git a/src/png/scripts/makefile.32sunu b/src/png/scripts/makefile.32sunu
index de7c4b1c1ba3f9a2d306a38cd70151d9bb09c3a1..bda63ad7f19e7879084a064c4ec90b9c32881fe0 100644 (file)
--- a/src/png/scripts/makefile.32sunu
+++ b/src/png/scripts/makefile.32sunu
@@ -26,14 +26,14 @@ 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) -lpng12 -lz -lm
+LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
 
 #RANLIB=ranlib
 RANLIB=echo
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -79,9 +79,12 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"-xtarget=ultra\"; \
-       echo ldflags=\"-xtarget=ultra -L$(LIBPATH) -R$(LIBPATH)\"; \
+       echo libdir=\"$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-R$(LIBPATH)\"; \
+       echo ccopts=\"-xtarget=ultra\"; \
+       echo ldopts=\"-xtarget=ultra\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -106,7 +109,11 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        ;; \
        esac
        $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz
+        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJS)
+       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \
+        -o libpng.so.3.$(PNGMIN)  $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -130,21 +137,24 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGVER)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -f -s libpng.so.3 libpng.so; \
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-       -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig
+       -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
        -@/bin/rm -f $(DL)/pkgconfig/libpng12.pc
        -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
        cp libpng.pc $(DL)/pkgconfig/libpng12.pc
@@ -168,7 +178,7 @@ install-config: libpng-config
        -@/bin/rm -f $(DB)/libpng12-config
        cp libpng-config $(DB)/libpng12-config
        chmod 755 $(DB)/libpng12-config
-       (cd $(DB); ln -sf libpng12-config libpng-config)
+       (cd $(DB); ln -f -s libpng12-config libpng-config)
 
 install: install-static install-shared install-man install-config
 
@@ -179,14 +189,16 @@ 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` \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \
           $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)*
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.64sunu b/src/png/scripts/makefile.64sunu
index 5f8e423fe4c11d7f76cd5fd24f460303d3a5607a..91ab35990024ef3403d7d32d7ca3f95272cc5f3c 100644 (file)
--- a/src/png/scripts/makefile.64sunu
+++ b/src/png/scripts/makefile.64sunu
@@ -33,7 +33,7 @@ RANLIB=echo
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -79,9 +79,12 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"-xtarget=ultra -xarch=v9\"; \
-       echo ldflags=\"-xtarget=ultra -xarch=v9 -L$(LIBPATH) -R$(LIBPATH)\"; \
+       echo libdir=\"$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-R$(LIBPATH)\"; \
+       echo ccopts=\"-xtarget=ultra -xarch=v9\"; \
+       echo ldopts=\"-xtarget=ultra -xarch=v9\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -106,7 +109,11 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        ;; \
        esac
        $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz
+        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJSDLL)
+       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \
+        -o libpng.so.3.$(PNGMIN)  $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -130,18 +137,22 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ).$(PNGVER)*
+       -@/bin/rm -f $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGVER)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -f -s libpng.so.3 libpng.so; \
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -168,7 +179,7 @@ install-config: libpng-config
        -@/bin/rm -f $(DB)/$(LIBNAME)-config
        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config
-       (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+       (cd $(DB); ln -f -s $(LIBNAME)-config libpng-config)
 
 install: install-static install-shared install-man install-config
 
@@ -179,14 +190,16 @@ 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` \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags ` \
           $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)*
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.aix b/src/png/scripts/makefile.aix
index 24ab2bdb69fca206c56753226011abed49a03421..029ca44c0daaf513ec0d34a0f94bdae2ae744c9c 100644 (file)
--- a/src/png/scripts/makefile.aix
+++ b/src/png/scripts/makefile.aix
@@ -16,8 +16,9 @@ AR = ar rcs
 RANLIB = ranlib
 RM = rm -f
 
+LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local
@@ -34,15 +35,16 @@ LIBPATH=$(prefix)/lib
 # you execute make install.
 DESTDIR=
 
-DI=$(DESTDIR)/$(INCPATH)
-DL=$(DESTDIR)/$(LIBPATH)
+DI=$(DESTDIR)$(INCPATH)
+DL=$(DESTDIR)$(LIBPATH)
 
 CDEBUG = -g -DPNG_DEBUG=5
 LDDEBUG =
 CRELEASE = -O2
 LDRELEASE = -s
-CFLAGS = -I$(ZLIBINC) -Wall $(CRELEASE)
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng -lz -lm $(LDRELEASE)
+WARNMORE=-Wall
+CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
+LDFLAGS = -L. -L$(ZLIBLIB) -lpng12 -lz -lm $(LDRELEASE)
 
 # File extensions
 O=.o
@@ -55,32 +57,40 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
        pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
 
 # Targets
-all: libpng$(A) pngtest$(E)
+all: $(LIBNAME)$(A) pngtest$(E)
 
-libpng$(A): $(OBJS)
+$(LIBNAME)$(A): $(OBJS)
        $(AR) $@ $(OBJS)
        $(RANLIB) $@
 
 test: pngtest$(E)
        ./pngtest$(E)
 
-pngtest$(E): pngtest$(O) libpng$(A)
+pngtest$(E): pngtest$(O) $(LIBNAME)$(A)
        $(LD) -o $@ pngtest$(O) $(LDFLAGS)
 
-install: libpng.a
+install: $(LIBNAME)$(A)
        -@if [ ! -d $(DI)  ]; then mkdir $(DI); fi
-       -@if [ ! -d $(DI)/libpng  ]; then mkdir $(DI)/libpng; fi
+       -@if [ ! -d $(DI)/$(LIBNAME)  ]; then mkdir $(DI)/$(LIBNAME); fi
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@rm $(DI)/png.h
-       -@rm $(DI)/pngconf.h
-       cp png.h pngconf.h $(DI)/libpng
-       chmod 644 $(DI)/libpng/png.h \
-       $(DI)/libpng/pngconf.h
-       (cd $(DI); ln -f -s libpng/* .)
-       cp libpng.a $(DL)
+       -@rm -f $(DI)/$(LIBNAME)/png.h
+       -@rm -f $(DI)/$(LIBNAME)/pngconf.h
+       -@rm -f $(DI)/png.h
+       -@rm -f $(DI)/pngconf.h
+       cp png.h pngconf.h $(DI)/$(LIBNAME)
+       chmod 644 $(DI)/$(LIBNAME)/png.h \
+       $(DI)/$(LIBNAME)/pngconf.h
+       -@rm -rf $(DI)/libpng
+       (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .)
+       -@rm -f $(DL)/$(LIBNAME)$(A)
+       -@rm -f $(DL)/libpng$(A)
+       cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A)
+       chmod 644 $(DL)/$(LIBNAME)$(A)
+       (cd $(DL); ln -f -s $(LIBNAME)$(A) libpng$(A))
+       (cd $(DI); ln -f -s libpng/* .;)
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngout.png
+       /bin/rm -f *.o $(LIBNAME)$(A) pngtest pngout.png
 
 png$(O): png.h pngconf.h
 pngerror$(O): png.h pngconf.h

diff --git a/src/png/scripts/makefile.beos b/src/png/scripts/makefile.beos
index a8507c1a2b88adbe2757f0193d2eee5895ebaf4b..73aff60ea6c1f8f3eb8396afebde0ef4009c440f 100644 (file)
--- a/src/png/scripts/makefile.beos
+++ b/src/png/scripts/makefile.beos
@@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib
 ZLIBINC=/usr/local/include
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 ALIGN=
@@ -77,9 +77,7 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-Wl,-soname=$(LIBNAME).so.$(PNGMAJ)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -92,9 +90,12 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
 
 $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
-       $(CC) -L$(ZLIBLIB) -lz -nostart -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -o
-$(LIBNAME).so.$(PNGVER) \
-        $(OBJSDLL)
+       $(CC) -nostart -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -o \
+       $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJSDLL)
+       $(CC) -nostart -Wl,-soname,libpng.so.3 -o \
+       libpng.so.3.$(PNGMIN) $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -L$(ZLIBLIB) -lz -lpng12 -o pngtest pngtest.o
@@ -118,18 +119,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -sf libpng.so.3 libpng.so; \
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -165,14 +169,16 @@ install: install-static install-shared install-man install-config
 
 test-installed:
        $(CC) $(CFLAGS) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtesti
+       /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
+       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtesti \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/src/png/scripts/makefile.cygwin b/src/png/scripts/makefile.cygwin
index 250d12d1a4b1a7933f5557cd121ceb92c5d30f60..a5fa3546ca9e152c4450b07e30cb19290c625156 100644 (file)
--- a/src/png/scripts/makefile.cygwin
+++ b/src/png/scripts/makefile.cygwin
@@ -78,11 +78,11 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGDLL = 13
-PNGMIN = 1.2.4
+CYGDLL = 12
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
-SHAREDLIB=cygpng$(PNGDLL).dll
+SHAREDLIB=cygpng$(CYGDLL).dll
 STATLIB=libpng.a
 IMPLIB=libpng.dll.a
 SHAREDDEF=libpng.def
@@ -147,10 +147,9 @@ libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
  installation..'\n' using PREFIX=\"$(prefix)\"'\n'
        ( cat $(S)/scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-L$(LIBPATH)\"; \
-       echo libs=\"-lpng$(PNGMAJ) -lz\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo libs=\"-lpng$(CYGDLL) -lz\"; \
        cat $(S)/scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
@@ -265,9 +264,9 @@ install: install-static install-shared install-man install-config
 
 test-installed:
        $(CC) $(CFLAGS) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) \
-          -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti$(EXE) pngtest.png
 
 clean:

diff --git a/src/png/scripts/makefile.darwin b/src/png/scripts/makefile.darwin
index 217eb8219c167f8c750af831cb4ae3b4371b233c..924eca2a4e947c14936278492ec4cd5f7e8e8344 100644 (file)
--- a/src/png/scripts/makefile.darwin
+++ b/src/png/scripts/makefile.darwin
@@ -1,5 +1,5 @@
 # makefile for libpng on Darwin / Mac OS X
-# Copyright (C) 2002 Glenn Randers-Pehrson
+# Copyright (C) 2002,2004 Glenn Randers-Pehrson
 # Copyright (C) 2001 Christoph Pfisterer
 # derived from makefile.linux:
 #  Copyright (C) 1998, 1999 Greg Roelofs
@@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 RANLIB=ranlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -71,9 +71,8 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-L$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -86,11 +85,18 @@ $(LIBNAME).$(PNGMAJ).dylib: $(LIBNAME).$(PNGVER).dylib
 
 $(LIBNAME).$(PNGVER).dylib: $(OBJSDLL)
        $(CC) -dynamiclib \
-        -install_name $(DL)/$(LIBNAME).$(PNGMAJ).dylib \
-        -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \
+        -install_name $(LIBPATH)/$(LIBNAME).$(PNGMAJ).dylib \
+        -current_version $(PNGVER) -compatibility_version $(PNGVER) \
         -o $(LIBNAME).$(PNGVER).dylib \
         $(OBJSDLL) -L$(ZLIBLIB) -lz
 
+libpng.3.$(PNGMIN).dylib: $(OBJSDLL)
+       $(CC) -dynamiclib \
+        -install_name $(LIBPATH)/libpng.3.dylib \
+        -current_version 3 -compatibility_version 3 \
+        -o libpng.3.$(PNGMIN).dylib \
+        $(OBJSDLL) -L$(ZLIBLIB) -lz
+
 pngtest: pngtest.o $(LIBNAME).dylib
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
@@ -110,22 +116,26 @@ install-static: install-headers libpng.a
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
        cp libpng.a $(DL)/$(LIBNAME).a
        chmod 644 $(DL)/$(LIBNAME).a
+       $(RANLIB) $(DL)/$(LIBNAME).a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).dylib libpng.pc
+install-shared: install-headers $(LIBNAME).dylib libpng.pc \
+       libpng.3.$(PNGMIN).dylib
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+       -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGVER)*.dylib
        -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib
        -@/bin/rm -f $(DL)/$(LIBNAME).dylib
        -@/bin/rm -f $(DL)/libpng.dylib
        -@/bin/rm -f $(DL)/libpng.3.dylib
-       -@/bin/rm -f $(DL)/libpng.3.*.dylib
+       -@/bin/rm -f $(DL)/libpng.3.$(PNGMIN)*.dylib
        cp $(LIBNAME).$(PNGVER).dylib $(DL)
+       cp libpng.3.$(PNGMIN).dylib $(DL)
        chmod 755 $(DL)/$(LIBNAME).$(PNGVER).dylib
+       chmod 755 $(DL)/libpng.3.$(PNGMIN).dylib
        (cd $(DL); \
-       ln -sf $(LIBNAME).$(PNGVER).dylib libpng.dylib; \
-       ln -sf $(LIBNAME).$(PNGVER).dylib libpng.3.dylib; \
-       ln -sf $(LIBNAME).$(PNGVER).dylib libpng.3.$(PNGMIN).dylib; \
+       ln -sf libpng.3.$(PNGMIN).dylib libpng.3.dylib; \
+       ln -sf libpng.3.dylib libpng.dylib; \
        ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \
        ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -161,14 +171,15 @@ install: install-static install-shared install-man install-config
 
 test-installed:
        $(CC) $(CFLAGS) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
-       $(LIBNAME).*dylib pngtesti
+       rm -f *.o libpng.a pngtest pngout.png libpng-config \
+       libpng.3.$(PNGMIN).dylib \
+       libpng.pc $(LIBNAME).*dylib pngtesti
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.dec b/src/png/scripts/makefile.dec
index 9076e76088605cf14d909522c82502a5253998a0..ac37fae29e60b8c27e06439fc93ab8c31b30bcef 100644 (file)
--- a/src/png/scripts/makefile.dec
+++ b/src/png/scripts/makefile.dec
@@ -32,13 +32,13 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
 CC=cc
 CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
+LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm
 
 #RANLIB=echo
 RANLIB=ranlib
@@ -59,9 +59,9 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"-std\"; \
-       echo ldflags=\"-L$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo ccopts=\"-std\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -73,8 +73,12 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
 
 $(LIBNAME).so.$(PNGVER): $(OBJS)
-       $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB)
-       -soname $(LIBNAME).so.$(PNGMAJ) -lz -lm
+       $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
+       -soname $(LIBNAME).so.$(PNGMAJ)
+
+libpng.so.3.$(PNGMIN): $(OBJS)
+       $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
+       -soname libpng.so.3
 
 pngtest: pngtest.o libpng.a
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -98,18 +102,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -f -s libpng.so.3 libpng.so; \
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -146,15 +153,17 @@ install: install-static install-shared install-man install-config
 test-installed:
        echo
        echo Testing installed dynamic shared library.
-       $(CC) -std -w1 -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+       $(CC) -w1 -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) -R$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)*
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/src/png/scripts/makefile.gcmmx b/src/png/scripts/makefile.gcmmx
index 0b6b14ce11032c755be0a8b26395bb660f049d95..2cb712513590645b5d528693294b06b0d6517704 100644 (file)
--- a/src/png/scripts/makefile.gcmmx
+++ b/src/png/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
@@ -104,10 +104,10 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_THREAD_UNSAFE_OK \
-          -DPNG_USE_PNGGCCRD\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -127,7 +127,12 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
 $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
        -o $(LIBNAME).so.$(PNGVER) \
-       $(OBJSDLL) -L$(ZLIBLIB) -lz -lm -lc
+       $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJSDLL)
+       $(CC) -shared -Wl,-soname,libpng.so.3 \
+       -o libpng.so.3.$(PNGMIN) \
+       $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -161,18 +166,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -sf libpng.so.3 libpng.so; \
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -208,14 +216,16 @@ install: install-static install-shared install-man install-config
 
 test-installed:
        $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti
+       /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
+       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.hpgcc b/src/png/scripts/makefile.hpgcc
index 0213ec8e250e2a2721dc10f371b1286d186b8908..03027156ffdfa2365359035733cc22a354cc3056 100644 (file)
--- a/src/png/scripts/makefile.hpgcc
+++ b/src/png/scripts/makefile.hpgcc
@@ -1,4 +1,4 @@
-# makefile for libpng on HP-UX using GCC
+# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
 # Copyright (C) 2002, Glenn Randers-Pehrson
 # Copyright (C) 2001, Laurent faillie
 # Copyright (C) 1998, 1999 Greg Roelofs
@@ -6,14 +6,22 @@
 # For conditions of distribution and use, see copyright notice in png.h
 
 CC=gcc
+LD=ld
 
-# where "make install" puts libpng.a, libpng.so*, png.h and pngconf.h
+# where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h
 prefix=/usr/local
 
 # Where the zlib library and include files are located
 ZLIBLIB=/opt/zlib/lib
 ZLIBINC=/opt/zlib/include
 
+# Note that if you plan to build a libpng shared library, zlib must also
+# be a shared library, which zlib's configure does not do.  After running
+# zlib's configure, edit the appropriate lines of makefile to read:
+#   CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \
+#   LDSHARED=ld -b
+#   SHAREDLIB=libz.sl
+
 ALIGN=
 # for i386:
 #ALIGN=-malign-loops=2 -malign-functions=2
@@ -33,7 +41,7 @@ RANLIB=ranlib
 #RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -80,22 +88,24 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
 $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ)
-       ln -f -s $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl
+       ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl
 
 $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER)
-       ln -f -s $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ)
+       ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ)
 
 $(LIBNAME).sl.$(PNGVER): $(OBJSDLL)
-       $(LD) -b -L$(ZLIBLIB) +s +b $(ZLIBLIB) \
-       +h libpng.sl.$(PNGMAJ) -o libpng.sl.$(PNGVER) $(OBJSDLL) -lz
+       $(LD) -b +s \
+       +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL)
+
+libpng.sl.3.$(PNGMIN): $(OBJSDLL)
+       $(LD) -b +s \
+       +h libpng.sl.3 -o libpng.sl.3.$(PNGMIN) $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).sl
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -120,22 +130,24 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc \
+       libpng.sl.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ)* $(DL)/$(LIBNAME).sl
-       -@/bin/rm -f $(DL)/libpng.so
-       -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl
+       -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ)
+       -@/bin/rm -f $(DL)/libpng.sl
+       -@/bin/rm -f $(DL)/libpng.sl.3
+       -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)*
        cp $(LIBNAME).sl.$(PNGVER) $(DL)
+       cp libpng.sl.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER)
+       chmod 755 $(DL)/libpng.sl.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3; \
-       ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3.$(PNGMIN); \
+       ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \
+       ln -sf libpng.sl.3 libpng.sl; \
        ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \
        ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
-       -@if [ ! -d $(DL)/pkgconfig ]; then mkdir \
-       $(DL)/pkgconfig; fi
+       -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
        -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
        -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
        cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
@@ -170,18 +182,16 @@ test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./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
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \
+       libpng.sl.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.hpux b/src/png/scripts/makefile.hpux
index 8226e16da88a84403f702a5774284c636c541de2..6a8a2d7ac43cb8696fea45b2fc426651934bd4f1 100644 (file)
--- a/src/png/scripts/makefile.hpux
+++ b/src/png/scripts/makefile.hpux
@@ -1,4 +1,4 @@
-# makefile for libpng, HPUX (10.20 and 11.00)
+# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
 # Copyright (C) 1999-2002 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
@@ -8,6 +8,13 @@
 ZLIBLIB=/opt/zlib/lib
 ZLIBINC=/opt/zlib/include
 
+# Note that if you plan to build a libpng shared library, zlib must also
+# be a shared library, which zlib's configure does not do.  After running
+# zlib's configure, edit the appropriate lines of makefile to read:
+#   CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \
+#   LDSHARED=ld -b
+#   SHAREDLIB=libz.sl
+
 CC=cc
 CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
 # Caution: be sure you have built zlib with the same CFLAGS.
@@ -17,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -57,7 +64,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config
 
 libpng.a: $(OBJS)
-       ar rc $@  $(OBJS)
+       ar rc $@ $(OBJS)
        $(RANLIB) $@
 
 libpng.pc:
@@ -66,9 +73,9 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"-Ae +DA1.1 +DS2.0"; \
-       echo ldflags=\"-L$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -80,9 +87,12 @@ $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER)
        ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ)
 
 $(LIBNAME).sl.$(PNGVER): $(OBJSDLL)
-       $(LD) -b -L$(ZLIBLIB) +s +b $(ZLIBLIB) \
-       +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) \
-       $(OBJSDLL) -lz
+       $(LD) -b +s \
+       +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL)
+
+libpng.sl.3.$(PNGMIN): $(OBJSDLL)
+       $(LD) -b +s \
+       +h libpng.sl.3 -o libpng.sl.3.$(PNGMIN) $(OBJSDLL)
 
 pngtest: pngtest.o libpng.a
        $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
@@ -106,18 +116,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc \
+       libpng.sl.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ)* $(DL)/$(LIBNAME).sl
+       -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl
+       -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.sl
        -@/bin/rm -f $(DL)/libpng.sl.3
-       -@/bin/rm -f $(DL)/libpng.sl.3.*
+       -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)*
        cp $(LIBNAME).sl.$(PNGVER) $(DL)
+       cp libpng.sl.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER)
+       chmod 755 $(DL)/libpng.sl.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl; \
-       ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3; \
-       ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl.3.$(PNGMIN); \
+       ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \
+       ln -sf libpng.sl.3 libpng.sl; \
        ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \
        ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -155,14 +168,16 @@ test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) $(CCFLAGS) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)*
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \
+       libpng.sl.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.linux b/src/png/scripts/makefile.linux
index 3ddac27e33224c18dcb286db15f463cc612ea2c7..3eba565b0077b03d49f8adea7bf34d86bac7f6e5 100644 (file)
--- a/src/png/scripts/makefile.linux
+++ b/src/png/scripts/makefile.linux
@@ -5,7 +5,7 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
@@ -83,9 +83,9 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -99,7 +99,12 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
 $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
        -o $(LIBNAME).so.$(PNGVER) \
-       $(OBJSDLL) -L$(ZLIBLIB) -lz -lm -lc
+       $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJSDLL)
+       $(CC) -shared -Wl,-soname,libpng.so.3 \
+       -o libpng.so.3.$(PNGMIN) \
+       $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -133,18 +138,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -sf libpng.so.3 libpng.so; \
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -180,14 +188,16 @@ install: install-static install-shared install-man install-config
 
 test-installed:
        $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti
+       /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
+       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.ne12bsd b/src/png/scripts/makefile.ne12bsd
index 0ce38e56d0503444b9f844f3e1f6379627df6d28..48066969cda7fa41513b6b3f73bf2febe794c844 100644 (file)
--- a/src/png/scripts/makefile.ne12bsd
+++ b/src/png/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
 
 LIB=   png12
 SHLIB_MAJOR=   0
-SHLIB_MINOR=   1.2.4
+SHLIB_MINOR=   1.2.6
 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/src/png/scripts/makefile.netbsd b/src/png/scripts/makefile.netbsd
index b1eab1eb60f35ba453a6b3664c3475b83bf80124..a7015267279d862a333a83d02e9cfb90b15fe055 100644 (file)
--- a/src/png/scripts/makefile.netbsd
+++ b/src/png/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
 
 LIB=   png
 SHLIB_MAJOR=   3
-SHLIB_MINOR=   1.2.4
+SHLIB_MINOR=   1.2.6
 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/src/png/scripts/makefile.openbsd b/src/png/scripts/makefile.openbsd
index 58616684481d988350b1cd0c1a5d9d1909b18d18..80c6bd265bc1327cfa04c318db16360b5f6c13f1 100644 (file)
--- a/src/png/scripts/makefile.openbsd
+++ b/src/png/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=   0
-SHLIB_MINOR=   1.2.4
+SHLIB_MINOR=   1.2.6
 
 LIB=   png
 SRCS=  png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

diff --git a/src/png/scripts/makefile.sco b/src/png/scripts/makefile.sco
index d9e0a076763d3dc73e1684b18bdcc773427f624e..7a4dc4f77d5c05ffdf349e32a1fd95742ead93aa 100644 (file)
--- a/src/png/scripts/makefile.sco
+++ b/src/png/scripts/makefile.sco
@@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -71,9 +71,9 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"-belf\"; \
-       echo ldflags=\"-L$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo ccopts=\"-belf\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -88,6 +88,10 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        $(CC) -G  -Wl,-h,$(LIBNAME).so.$(PNGMAJ) -o $(LIBNAME).so.$(PNGVER) \
         $(OBJSDLL)
 
+libpng.so.3.$(PNGMIN): $(OBJSDLL)
+       $(CC) -G  -Wl,-h,libpng.so.3 -o libpng.so.3.$(PNGMIN) \
+       $(OBJSDLL)
+
 pngtest: pngtest.o $(LIBNAME).so
        LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
@@ -112,18 +116,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -f -s libpng.so.3 libpng.so; \
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -150,7 +157,7 @@ install-config: libpng-config
        -@/bin/rm -f $(DB)/$(LIBNAME)-config
        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config
-       (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+       (cd $(DB); ln -f -s $(LIBNAME)-config libpng-config)
 
 install: install-static install-shared install-man install-config
 
@@ -159,18 +166,16 @@ install: install-static install-shared install-man install-config
 
 test-installed:
        $(CC) $(CFLAGS) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti
-
-
-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-config \
+       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.sggcc b/src/png/scripts/makefile.sggcc
index edae3172564c5c5fa1264690a9e851558790bbf7..9886476fdea817a0d04d40b9e2d21b4c8c4420d0 100644 (file)
--- a/src/png/scripts/makefile.sggcc
+++ b/src/png/scripts/makefile.sggcc
@@ -18,7 +18,7 @@ ZLIBINC=../zlib
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 CC=gcc
 
@@ -29,7 +29,10 @@ ABI=
 WARNMORE= # -g -DPNG_DEBUG=5
 CFLAGS=$(ABI) -I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
-LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ)
+LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \
+  -set_version sgi$(PNGMAJ).0
+LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \
+  -set_version sgi$3.0
 # See "man dso" for info about shared objects
 
 RANLIB=echo
@@ -69,17 +72,16 @@ libpng.a: $(OBJS)
 shared: $(LIBNAME).so.$(PNGVER)
 
 libpng.pc:
-       cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > \
-       libpng.pc
+       cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \
-               -DPNG_NO_ASSEMBLER_CODE\"; \
-       echo cflags=\"$(ABI)\"; \
-       echo ldflags=\"-L$(LIBPATH)\"; \
-       echo rpath=\"$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo ccopts=\"$(ABI)\"; \
+       echo ldopts=\"$(ABI)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo libdir=\"$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -94,6 +96,9 @@ $(LIBNAME).so.$(PNGVER): $(OBJS)
        $(LDSHARED) -o $@ $(OBJS)
        rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
 
+libpng.so.3.$(PNGMIN): $(OBJS)
+       $(LDLEGACY) -o $@ $(OBJS)
+
 pngtest: pngtest.o libpng.a
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
@@ -118,18 +123,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -sf libpng.so.3 libpng.so; \
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -164,17 +172,19 @@ install: install-static install-shared install-man install-config
 # move the library to its final location.
 
 test-installed:
-       $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-          -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --rpath` \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
        echo
        echo Testing installed dynamic shared library.
+       $(CC) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* so_locations
+       rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
+       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
+       libpng.so.3.$(PNGMIN) \
+       so_locations
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.so9 b/src/png/scripts/makefile.so9
index 0713b9798a3ced58f69c3c874522676f5829a527..dd08212bd69ad663badb11c31ff10a1c5d1ae9c6 100644 (file)
--- a/src/png/scripts/makefile.so9
+++ b/src/png/scripts/makefile.so9
@@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -81,9 +81,9 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-R$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -107,8 +107,12 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        echo; \
        ;; \
        esac
-       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz
+       $(LD) -G -h $(LIBNAME).so.$(PNGMAJ) \
+        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJS)
+       $(LD) -G -h libpng.so.3 \
+        -o libpng.so.3.$(PNGMIN) $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -132,18 +136,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -f -s libpng.so.3 libpng.so; \
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -170,7 +177,7 @@ install-config: libpng-config
        -@/bin/rm -f $(DB)/$(LIBNAME)-config
        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config
-       (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+       (cd $(DB); ln -f -s $(LIBNAME)-config libpng-config)
 
 install: install-static install-shared install-man install-config
 
@@ -181,14 +188,16 @@ 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` \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \
           -L$(ZLIBLIB) -R$(ZLIBLIB)
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)*
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.solaris b/src/png/scripts/makefile.solaris
index d880ea4bbdf13d766b40e0e05a129bbdb36a080a..db2fc1cda617a6d708b0b93a439f549e3048e86a 100644 (file)
--- a/src/png/scripts/makefile.solaris
+++ b/src/png/scripts/makefile.solaris
@@ -1,5 +1,5 @@
 # makefile for libpng on Solaris 2.x with gcc
-# Copyright (C) 2002 Glenn Randers-Pehrson
+# Copyright (C) 2004 Glenn Randers-Pehrson
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
@@ -22,7 +22,7 @@ ZLIBINC=/usr/local/include
 WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
        -Wmissing-declarations -Wtraditional -Wcast-align \
        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
-CFLAGS=-I$(ZLIBINC) -Wall -O3 \
+CFLAGS=-I$(ZLIBINC) -Wall -O \
        # $(WARNMORE) -g -DPNG_DEBUG=5
 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 
@@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.6
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -77,10 +77,10 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \
-               -DPNG_NO_ASSEMBLER_CODE\"; \
-       echo cflags=\"$(ABI)\"; \
-       echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-R$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -104,8 +104,12 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        echo; \
        ;; \
        esac
-       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz
+       $(LD) -G -h $(LIBNAME).so.$(PNGMAJ) \
+        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJS)
+       $(LD) -G -h libpng.so.3 \
+        -o libpng.so.3.$(PNGMIN) $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -129,18 +133,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -f -s libpng.so.3 libpng.so; \
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so; \
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ))
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -167,7 +174,7 @@ install-config: libpng-config
        -@/bin/rm -f $(DB)/$(LIBNAME)-config
        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config
-       (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+       (cd $(DB); ln -s -f $(LIBNAME)-config libpng-config)
 
 install: install-static install-shared install-man install-config
 
@@ -178,14 +185,16 @@ 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` \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \
           -L$(ZLIBLIB) -R$(ZLIBLIB)
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)*
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

diff --git a/src/png/scripts/makefile.vcawin32 b/src/png/scripts/makefile.vcawin32
index 812dd8fffe134772ff4949c44744c7f51198ee9a..4c2f3cc0eebd0e0cc988a767e1571641bb35cfa7 100644 (file)
--- a/src/png/scripts/makefile.vcawin32
+++ b/src/png/scripts/makefile.vcawin32
@@ -5,31 +5,35 @@
 # To use, do "nmake /f scripts\makefile.vcawin32"
 
 # -------- Microsoft Visual C++ 5.0 and later, uses assembler code --------
-
-# Caution: the assembler code was introduced at libpng version 1.0.4 and has
-# not yet been thoroughly tested.
-
-# If you don't want to use assembler code, use makefile.vcwin32 instead.
-
-CFLAGS=-DPNG_USE_PNGVCRD -Ox -GA3s -nologo -W3 -I..\zlib
-
-CC=cl
-LD=link
-LDFLAGS= 
+# If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead.
+
+# Compiler, linker, librarian, and other tools
+CC = cl
+LD = link
+AR = lib
+CFLAGS  = -DPNG_USE_PNGVCRD -nologo -MD -O2 -W3 -I..\zlib
+LDFLAGS = -nologo
+ARFLAGS = -nologo
+RM = del
+
+# File extensions
 O=.obj
 
 #uncomment next to put error messages in a file
-#ERRFILE= >> pngerrs
+#ERRFILE= >> pngerrs.log
 
-# variables
-OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)
-OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)
-OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) pngvcrd$(O)
+# Variables
+OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)
+OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)
+OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
+OBJS4 = pngvcrd$(O)
+OBJS  = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
 
+# Targets
 all: libpng.lib
 
 png$(O): png.h pngconf.h
-                 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
+       $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
 pngset$(O): png.h pngconf.h
        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
@@ -49,9 +53,6 @@ pngrtran$(O): png.h pngconf.h
 pngrutil$(O): png.h pngconf.h
        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
-pngvcrd$(O): png.h pngconf.h
-       $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
 pngerror$(O): png.h pngconf.h
        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
@@ -79,16 +80,24 @@ pngwtran$(O): png.h pngconf.h
 pngwutil$(O): png.h pngconf.h
        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
-libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3)
-       echo something to del > libpng.lib
-       del libpng.lib
-       lib /OUT:libpng.lib $(OBJS1) $(OBJS2) $(OBJS3)
+pngvcrd$(O): png.h pngconf.h
+       $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
+
+libpng.lib: $(OBJS)
+       -$(RM) $@
+       $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
 
-pngtest.exe: pngtest.obj libpng.lib
-       $(LD) $(LDFLAGS) pngtest.obj libpng.lib ..\zlib\zlib.lib /OUT:pngtest.exe /SUBSYSTEM:CONSOLE
+pngtest.exe: pngtest$(O) libpng.lib
+       $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
 
 test: pngtest.exe
        pngtest
 
+clean:
+       -$(RM) *$(O)
+       -$(RM) libpng.lib
+       -$(RM) pngtest.exe
+       -$(RM) pngout.png
+
 # End of makefile for libpng
 

diff --git a/src/png/scripts/makefile.vcwin32 b/src/png/scripts/makefile.vcwin32
index 64b762e217f2cd76446d840531e61bc97af9ed8f..d23d81296cbda1a5f309ffc4492689fed9bcab7c 100644 (file)
--- a/src/png/scripts/makefile.vcwin32
+++ b/src/png/scripts/makefile.vcwin32
@@ -4,28 +4,35 @@
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
 # To use, do "nmake /f scripts\makefile.vcwin32"
 
-# -------- Microsoft Visual C++ 4.0 and later, no assembler code --------
-# If you want to use assembler code, use makefile.vcawin32 instead.
-
-CFLAGS= -Ox -GA3s -nologo -W3 -I..\zlib
-
-CC=cl
-LD=link
-LDFLAGS= 
+# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------
+# If you want to use assembler (MMX) code, use makefile.vcawin32 instead.
+
+# Compiler, linker, librarian, and other tools
+CC = cl
+LD = link
+AR = lib
+CFLAGS  = -nologo -MD -O2 -W3 -I..\zlib
+LDFLAGS = -nologo
+ARFLAGS = -nologo
+RM = del
+
+# File extensions
 O=.obj
 
 #uncomment next to put error messages in a file
-#ERRFILE= >> pngerrs
+#ERRFILE= >> pngerrs.log
 
-# variables
-OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)
-OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)
-OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
+# Variables
+OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)
+OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)
+OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
+OBJS  = $(OBJS1) $(OBJS2) $(OBJS3)
 
+# Targets
 all: libpng.lib
 
 png$(O): png.h pngconf.h
-                 $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
+       $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
 pngset$(O): png.h pngconf.h
        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
@@ -72,16 +79,21 @@ pngwtran$(O): png.h pngconf.h
 pngwutil$(O): png.h pngconf.h
        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
-libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3)
-       echo something to del > libpng.lib
-       del libpng.lib
-       lib /OUT:libpng.lib $(OBJS1) $(OBJS2) $(OBJS3)
+libpng.lib: $(OBJS)
+       -$(RM) $@
+       $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
 
-pngtest.exe: pngtest.obj libpng.lib
-       $(LD) $(LDFLAGS) pngtest.obj libpng.lib ..\zlib\zlib.lib /OUT:pngtest.exe /SUBSYSTEM:CONSOLE
+pngtest.exe: pngtest$(O) libpng.lib
+       $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
 
 test: pngtest.exe
        pngtest
 
+clean:
+       -$(RM) *$(O)
+       -$(RM) libpng.lib
+       -$(RM) pngtest.exe
+       -$(RM) pngout.png
+
 # End of makefile for libpng
 

diff --git a/src/png/scripts/pngos2.def b/src/png/scripts/pngos2.def
index 92cd5aafbe157e2653a58522a41866c667310740..bb21d979cf9d92e54a74075bc83d47d00c8c7fe3 100644 (file)
--- a/src/png/scripts/pngos2.def
+++ b/src/png/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.4
+; Version 1.2.6
 
 LIBRARY                PNG
 DESCRIPTION    "PNG image compression library for OS/2"
@@ -184,27 +184,6 @@ EXPORTS
   png_convert_to_rfc1123
   png_set_invalid
 
-; Added at version 1.2.0:
-  png_mmx_support
-  png_permit_empty_plte
-  png_permit_mng_features
-  png_get_mmx_flagmask
-  png_get_asm_flagmask
-  png_get_asm_flags
-  png_get_mmx_bitdepth_threshold
-  png_get_mmx_rowbytes_threshold
-  png_set_asm_flags
-  png_init_mmx_flags
-
-; Added at version 1.2.2:
-  png_handle_as_unknown
-
-; Added at version 1.2.2 and deleted from 1.2.3:
-; png_zalloc
-; png_zfree
-
-; Added at version 1.2.4
-  png_malloc_warn
 
 ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS
   png_libpng_ver