Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / png / scripts / makefile.sco

diff --git a/src/png/scripts/makefile.sco b/src/png/scripts/makefile.sco
index 5df2523377cad91717a5604a1c2abac4ff18a653..1dcb7d96b5839c19f594de3ddd3a448f184bc896 100644 (file)
--- a/src/png/scripts/makefile.sco
+++ b/src/png/scripts/makefile.sco
@@ -1,24 +1,23 @@
 # makefile for SCO OSr5  ELF and Unixware 7 with Native cc
 # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
 #   force ELF build dynamic linking, SONAME setting in lib and RPATH in app
-# 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.20
-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
@@ -38,10 +37,10 @@ exec_prefix=$(prefix)
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
-CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
+CFLAGS= -dy -belf -I$(ZLIBINC) -O3
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm
 
-INCPATH=$(prefix)/include/libpng
+INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
 BINPATH=$(exec_prefix)/bin
@@ -79,7 +78,11 @@ libpng.a: $(OBJS)
        $(RANLIB) $@
 
 libpng.pc:
-       cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
+       cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
+       -e s!@exec_prefix@!$(exec_prefix)! \
+       -e s!@libdir@!$(LIBPATH)! \
+       -e s!@includedir@!$(INCPATH)! \
+       -e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc
 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
@@ -87,24 +90,17 @@ libpng-config:
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo ccopts=\"-belf\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
-       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)
-       $(CC) -G  -Wl,-h,$(LIBSOMAJ) -o $(LIBSOVER) \
+$(LIBSOMAJ): $(OBJSDLL)
+       $(CC) -G  -Wl,-h,$(LIBSOMAJ) -o $(LIBSOMAJ) \
         $(OBJSDLL)
 
-$(OLDSOVER): $(OBJSDLL)
-       $(CC) -G  -Wl,-h,$(OLDSOMAJ) -o $(OLDSOVER) \
-       $(OBJSDLL)
-
 pngtest: pngtest.o $(LIBSO)
        LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
@@ -129,23 +125,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)/$(OLDSOVER)*
-       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
@@ -197,7 +186,6 @@ test-installed:
 clean:
        $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
        $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
-       $(OLDSOVER) \
        libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
@@ -206,20 +194,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