Merge in from trunk r64802 - r68625

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

diff --git a/src/png/scripts/makefile.sgi b/src/png/scripts/makefile.sgi
index b972e55af3e2f1e4d0b87a3be1ccba1ac813d305..0c381da74d5c9b19e50e974b95157368892702d3 100644 (file)
--- a/src/png/scripts/makefile.sgi
+++ b/src/png/scripts/makefile.sgi
@@ -1,17 +1,34 @@
-# makefile for libpng.a and libpng12.so, SGI IRIX with 'cc'
-# Copyright (C) 2001-2002 Glenn Randers-Pehrson
+# makefile for libpng.a and libpng14.so, SGI IRIX with 'cc'
+# Copyright (C) 2001-2002, 2006, 2007, 2010 Glenn Randers-Pehrson

 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.

-# For conditions of distribution and use, see copyright notice in png.h
-
-LIBNAME=libpng12
-PNGMAJ = 0
-PNGMIN = 1.2.6
-PNGVER = $(PNGMAJ).$(PNGMIN)
+#
+# 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=libpng14
+PNGMAJ = 14
+
+# Shared library names:
+LIBSO=$(LIBNAME).so
+LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
+LIBSOREL=$(LIBSOMAJ).$(RELEASE)
+OLDSO=libpng.so
+
+# Utilities:
+AR_RC=ar rc
+CC=cc
+MKDIR_P=mkdir -p
+LN_SF=ln -sf
+RANLIB=echo
+RM_F=/bin/rm -f

 
 

-# 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 must be a full pathname.
 
 prefix=/usr/local
 # Prefix must be a full pathname.
 
 prefix=/usr/local

+exec_prefix=$(prefix)

 
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib32
 
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib32


@@ -21,33 +38,25 @@ prefix=/usr/local
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 

-CC=cc
-

 # ABI can be blank to use default for your system, -32, -o32, -n32, or -64
 # See "man abi".  zlib must be built with the same ABI.
 ABI=
 
 WARNMORE=-fullwarn
 # Note: -KPIC is the default anyhow
 # ABI can be blank to use default for your system, -32, -o32, -n32, or -64
 # See "man abi".  zlib must be built with the same ABI.
 ABI=
 
 WARNMORE=-fullwarn
 # Note: -KPIC is the default anyhow

-#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_USE_PNGGCCRD # -g -DPNG_DEBUG=5
-CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD \
-  -DPNG_NO_ASSEMBLER_CODE
-LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng12 -lz -lm
+#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5
+CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE)
+LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng14 -lz -lm

 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm

-LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \
+LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \

   -set_version sgi$(PNGMAJ).0
   -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
 
 # See "man dso" for info about shared objects
 

-RANLIB=echo
-#RANLIB=ranlib
-

 INCPATH=$(prefix)/include
 INCPATH=$(prefix)/include

-LIBPATH=$(prefix)/lib
-#LIBPATH=$(prefix)/lib32
+LIBPATH=$(exec_prefix)/lib
+#LIBPATH=$(exec_prefix)/lib32

 MANPATH=$(prefix)/man
 MANPATH=$(prefix)/man

-BINPATH=$(prefix)/bin
+BINPATH=$(exec_prefix)/bin

 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:


@@ -64,46 +73,41 @@ DI=$(DESTDIR)$(INCPATH)
 DL=$(DESTDIR)$(LIBPATH)
 DM=$(DESTDIR)$(MANPATH)
 
 DL=$(DESTDIR)$(LIBPATH)
 DM=$(DESTDIR)$(MANPATH)
 

-OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+OBJS =  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
 
 all: libpng.a pngtest shared libpng.pc libpng-config
 
 libpng.a: $(OBJS)
        pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
        pngwtran.o pngmem.o pngerror.o pngpread.o
 
 all: libpng.a pngtest shared libpng.pc libpng-config
 
 libpng.a: $(OBJS)

-       ar rc $@ $(OBJS)
+       $(AR_RC) $@ $(OBJS)

        $(RANLIB) $@
 
        $(RANLIB) $@
 

-shared: $(LIBNAME).so.$(PNGVER)
-

 libpng.pc:
 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; \
        echo prefix=\"$(prefix)\"; \
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \

-       echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE\"; \

        echo ccopts=\"$(ABI)\"; \
        echo ldopts=\"$(ABI)\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
        echo libdir=\"$(LIBPATH)\"; \
        echo ccopts=\"$(ABI)\"; \
        echo ldopts=\"$(ABI)\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
        echo libdir=\"$(LIBPATH)\"; \

-       echo libs=\"-lpng12 -lz -lm\"; \
+       echo libs=\"-lpng14 -lz -lm\"; \

        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 

-$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
-       ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
-
-$(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
-       ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
+$(LIBSO): $(LIBSOMAJ)
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO)

 
 

-$(LIBNAME).so.$(PNGVER): $(OBJS)
+$(LIBSOMAJ): $(OBJS)

        $(LDSHARED) -o $@ $(OBJS)
        $(LDSHARED) -o $@ $(OBJS)

-       rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
-
-libpng.so.3.$(PNGMIN): $(OBJS)
-       $(LDLEGACY) -o $@ $(OBJS)
+       $(RM_F) $(LIBSO) $(LIBSOMAJ)

 
 pngtest: pngtest.o libpng.a
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 pngtest: pngtest.o libpng.a
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)


@@ -114,82 +118,86 @@ test: pngtest
        ./pngtest
 
 install-headers: png.h pngconf.h
        ./pngtest
 
 install-headers: png.h pngconf.h

-       -@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-       -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+       -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+       -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi

        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h

-       -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
-       -@/bin/rm -f $(DI)/libpng
-       (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
+       -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
+       -@$(RM_F) $(DI)/libpng
+       (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)

 
 install-static: install-headers libpng.a
 
 install-static: install-headers libpng.a

-       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi

        cp libpng.a $(DL)/$(LIBNAME).a
        chmod 644 $(DL)/$(LIBNAME).a
        cp libpng.a $(DL)/$(LIBNAME).a
        chmod 644 $(DL)/$(LIBNAME).a

-       -@/bin/rm -f $(DL)/libpng.a
-       (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
-
-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.$(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.$(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)
+       -@$(RM_F) $(DL)/libpng.a
+       (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+
+install-shared: install-headers $(LIBSOMAJ) libpng.pc
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+       -@$(RM_F) $(DL)/$(LIBSO)
+       -@$(RM_F) $(DL)/$(LIBSOREL)
+       -@$(RM_F) $(DL)/$(OLDSO)
+       cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
+       chmod 755 $(DL)/$(LIBSOREL)

        (cd $(DL); \
        (cd $(DL); \

-       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
-       -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
-       -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
+       $(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

        cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
        chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
        cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
        chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc

-       (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
+       (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)

 
 install-man: libpng.3 libpngpf.3 png.5
 
 install-man: libpng.3 libpngpf.3 png.5

-       -@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-       -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
-       -@/bin/rm -f $(DM)/man3/libpng.3
-       -@/bin/rm -f $(DM)/man3/libpngpf.3
+       -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+       -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
+       -@$(RM_F) $(DM)/man3/libpng.3
+       -@$(RM_F) $(DM)/man3/libpngpf.3

        cp libpng.3 $(DM)/man3
        cp libpngpf.3 $(DM)/man3
        cp libpng.3 $(DM)/man3
        cp libpngpf.3 $(DM)/man3

-       -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
-       -@/bin/rm -f $(DM)/man5/png.5
+       -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
+       -@$(RM_F) $(DM)/man5/png.5

        cp png.5 $(DM)/man5
 
 install-config: libpng-config
        cp png.5 $(DM)/man5
 
 install-config: libpng-config

-       -@if [ ! -d $(DB) ]; then mkdir $(DB); fi
-       -@/bin/rm -f $(DB)/libpng-config
-       -@/bin/rm -f $(DB)/$(LIBNAME)-config
+       -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+       -@$(RM_F) $(DB)/libpng-config
+       -@$(RM_F) $(DB)/$(LIBNAME)-config

        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(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_SF) $(LIBNAME)-config libpng-config)

 
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
 
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you

-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) \
+           -rpath $(ZLIBLIB):$(DL) \
+          -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
+       ./pngtestd pngtest.png

 
 test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) -I$(ZLIBINC) \
 
 test-installed:
        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`
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
+          -L$(ZLIBLIB) \
+           -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \
+          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`

        ./pngtesti pngtest.png
 
 clean:
        ./pngtesti pngtest.png
 
 clean:

-       rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
-       libpng.so.3.$(PNGMIN) \
+       $(RM_F) *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
+       $(LIBSO) $(LIBSOMAJ)* \

        so_locations
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
        so_locations
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO


@@ -198,21 +206,20 @@ writelock:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

-png.o: png.h pngconf.h
-pngerror.o: png.h pngconf.h
-pngrio.o: png.h pngconf.h
-pngwio.o: png.h pngconf.h
-pngmem.o: png.h pngconf.h
-pngset.o: png.h pngconf.h
-pngget.o: png.h pngconf.h
-pngread.o: png.h pngconf.h
-pngrtran.o: png.h pngconf.h
-pngrutil.o: png.h pngconf.h
-pngtest.o: png.h pngconf.h
-pngtrans.o: png.h pngconf.h
-pngwrite.o: png.h pngconf.h
-pngwtran.o: png.h pngconf.h
-pngwutil.o: png.h pngconf.h
-pngpread.o: png.h pngconf.h
-pnggccrd.o: png.h pngconf.h
+png.o: png.h pngconf.h pngpriv.h
+pngerror.o: png.h pngconf.h pngpriv.h
+pngrio.o: png.h pngconf.h pngpriv.h
+pngwio.o: png.h pngconf.h pngpriv.h
+pngmem.o: png.h pngconf.h pngpriv.h
+pngset.o: png.h pngconf.h pngpriv.h
+pngget.o: png.h pngconf.h pngpriv.h
+pngread.o: png.h pngconf.h pngpriv.h
+pngrtran.o: png.h pngconf.h pngpriv.h
+pngrutil.o: png.h pngconf.h pngpriv.h
+pngtrans.o: png.h pngconf.h pngpriv.h
+pngwrite.o: png.h pngconf.h pngpriv.h
+pngwtran.o: png.h pngconf.h pngpriv.h
+pngwutil.o: png.h pngconf.h pngpriv.h
+pngpread.o: png.h pngconf.h pngpriv.h

 
 

+pngtest.o: png.h pngconf.h