Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / png / scripts / makefile.32sunu

diff --git a/src/png/scripts/makefile.32sunu b/src/png/scripts/makefile.32sunu
index 17faf783f899446c9a72a92b9d40b282505a37b8..3dd9fefe35c814ac2ac180c012b0ad55ff3cf475 100644 (file)
--- a/src/png/scripts/makefile.32sunu
+++ b/src/png/scripts/makefile.32sunu
@@ -1,23 +1,22 @@
 # makefile for libpng on Solaris 2.x with cc
 # Contributed by William L. Sebok, based on makefile.linux
-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2010 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
 
 # Library name:
-LIBNAME=libpng12
-PNGMAJ = 0
-PNGMIN = 1.2.34
-PNGVER = $(PNGMAJ).$(PNGMIN)
+LIBNAME=libpng14
+PNGMAJ = 14
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
 LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOVER=$(LIBNAME).so.$(PNGVER)
+LIBSOREL=$(LIBSOMAJ).$(RELEASE)
 OLDSO=libpng.so
-OLDSOMAJ=libpng.so.3
-OLDSOVER=libpng.so.3.$(PNGMIN)
 
 # Utilities:
 CC=cc
@@ -30,7 +29,7 @@ RM_F=/bin/rm -f
 SUN_CC_FLAGS=-fast -xtarget=ultra
 SUN_LD_FLAGS=-fast -xtarget=ultra
 
-# where make install puts libpng.a, libpng12.so and libpng12/png.h
+# where make install puts libpng.a, libpng14.so and libpng14/png.h
 prefix=/a
 exec_prefix=$(prefix)
 
@@ -92,7 +91,7 @@ libpng.pc:
        -e s!@exec_prefix@!$(exec_prefix)! \
        -e s!@libdir@!$(LIBPATH)! \
        -e s!@includedir@!$(INCPATH)! \
-       -e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
+       -e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc
 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
@@ -103,17 +102,14 @@ libpng-config:
        echo R_opts=\"-R$(LIBPATH)\"; \
        echo ccopts=\"-xtarget=ultra\"; \
        echo ldopts=\"-xtarget=ultra\"; \
-       echo libs=\"-lpng12 -lz -lm\"; \
+       echo libs=\"-lpng14 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
        $(LN_SF) $(LIBSOMAJ) $(LIBSO)
 
-$(LIBSOMAJ): $(LIBSOVER)
-       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
-
-$(LIBSOVER): $(OBJSDLL)
+$(LIBSOMAJ): $(OBJSDLL)
        @case "`type ld`" in *ucb*) \
        echo; \
        echo '## WARNING:'; \
@@ -127,11 +123,7 @@ $(LIBSOVER): $(OBJSDLL)
        ;; \
        esac
        $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \
-        -o $(LIBSOVER) $(OBJSDLL)
-
-$(OLDSOVER): $(OBJSDLL)
-       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(OLDSOMAJ) \
-        -o $(OLDSOVER)  $(OBJSDLL)
+        -o $(LIBSOMAJ) $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBSO)
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -155,24 +147,16 @@ install-static: install-headers libpng.a
        -@$(RM_F) $(DL)/libpng.a
        (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBSOVER) libpng.pc \
-       $(OLDSOVER)
+install-shared: install-headers $(LIBSOMAJ) libpng.pc
        -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-       -@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
-       -@$(RM_F) $(DL)/$(LIBSOMAJ)
        -@$(RM_F) $(DL)/$(LIBSO)
+       -@$(RM_F) $(DL)/$(LIBSOREL)
        -@$(RM_F) $(DL)/$(OLDSO)
-       -@$(RM_F) $(DL)/$(OLDSOMAJ)
-       -@$(RM_F) $(DL)/$(OLDSOMAJ).$(PNGVER)*
-       cp $(LIBSOVER) $(DL)
-       cp $(OLDSOVER) $(DL)
-       chmod 755 $(DL)/$(LIBSOVER)
-       chmod 755 $(DL)/$(OLDSOVER)
+       cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
+       chmod 755 $(DL)/$(LIBSOREL)
        (cd $(DL); \
-       $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
-       $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
-       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
-       $(LN_SF) $(LIBSOMAJ) $(LIBSO))
+       $(LN_SF) $(LIBSOREL) $(LIBSO); \
+       $(LN_SF) $(LIBSO) $(OLDSO))
        -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
        -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
        -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@@ -226,7 +210,6 @@ test-installed:
 clean:
        $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
        libpng-config $(LIBSO) $(LIBSOMAJ)* \
-       $(OLDSOVER) \
        libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
@@ -235,20 +218,20 @@ writelock:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-png.o png.pic.o: png.h pngconf.h
-pngerror.o pngerror.pic.o: png.h pngconf.h
-pngrio.o pngrio.pic.o: png.h pngconf.h
-pngwio.o pngwio.pic.o: png.h pngconf.h
-pngmem.o pngmem.pic.o: png.h pngconf.h
-pngset.o pngset.pic.o: png.h pngconf.h
-pngget.o pngget.pic.o: png.h pngconf.h
-pngread.o pngread.pic.o: png.h pngconf.h
-pngrtran.o pngrtran.pic.o: png.h pngconf.h
-pngrutil.o pngrutil.pic.o: png.h pngconf.h
-pngtrans.o pngtrans.pic.o: png.h pngconf.h
-pngwrite.o pngwrite.pic.o: png.h pngconf.h
-pngwtran.o pngwtran.pic.o: png.h pngconf.h
-pngwutil.o pngwutil.pic.o: png.h pngconf.h
-pngpread.o pngpread.pic.o: png.h pngconf.h
+png.o png.pic.o: png.h pngconf.h pngpriv.h
+pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h
+pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h
+pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h
+pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h
+pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h
+pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h
+pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h
+pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h
+pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
+pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
 pngtest.o: png.h pngconf.h