corrected conlfict after import of libpng-1.2.4

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

diff --git a/src/png/scripts/makefile.sgi b/src/png/scripts/makefile.sgi
index 965cf91fd024f7e2bfd20c557e813060a9ec498e..71e954fe16af1d3bb60ba974e9aa4bc34388ca8a 100644 (file)
--- a/src/png/scripts/makefile.sgi
+++ b/src/png/scripts/makefile.sgi
@@ -1,8 +1,21 @@
-# makefile for libpng
+# makefile for libpng.a and libpng12.so, SGI IRIX with 'cc'
+# Copyright (C) 2001-2002 Glenn Randers-Pehrson

 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # For conditions of distribution and use, see copyright notice in png.h
 
 # 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.4
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+# Where make install puts libpng.a, libpng12.so, and libpng12/png.h
+# Prefix must be a full pathname.
+
+prefix=/usr/local
+

 # Where the zlib library and include files are located
 # Where the zlib library and include files are located

+#ZLIBLIB=/usr/local/lib32
+#ZLIBINC=/usr/local/include

 #ZLIBLIB=/usr/local/lib
 #ZLIBINC=/usr/local/include
 ZLIBLIB=../zlib
 #ZLIBLIB=/usr/local/lib
 #ZLIBINC=/usr/local/include
 ZLIBLIB=../zlib


@@ -10,43 +23,164 @@ ZLIBINC=../zlib
 
 CC=cc
 
 
 CC=cc
 

-CFLAGS=-I$(ZLIBINC) -O -fullwarn # -g -DPNG_DEBUG=1
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
+# 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
+LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
+LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ)
+# See "man dso" for info about shared objects

 
 RANLIB=echo
 #RANLIB=ranlib
 
 
 RANLIB=echo
 #RANLIB=ranlib
 

-# where make install puts libpng.a and png.h
-prefix=/usr/local
+INCPATH=$(prefix)/include
+LIBPATH=$(prefix)/lib
+#LIBPATH=$(prefix)/lib32
+MANPATH=$(prefix)/man
+BINPATH=$(prefix)/bin
+
+# override DESTDIR= on the make install command line to easily support
+# installing into a temporary location.  Example:
+#
+#    make install DESTDIR=/tmp/build/libpng
+#
+# If you're going to install into a temporary location
+# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
+# you execute make install.
+DESTDIR=
+
+DB=$(DESTDIR)$(BINPATH)
+DI=$(DESTDIR)$(INCPATH)
+DL=$(DESTDIR)$(LIBPATH)
+DM=$(DESTDIR)$(MANPATH)

 
 

-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \

        pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
        pngwtran.o pngmem.o pngerror.o pngpread.o
 
        pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
        pngwtran.o pngmem.o pngerror.o pngpread.o
 

-all: libpng.a pngtest
+all: libpng.a pngtest shared libpng.pc libpng-config

 
 libpng.a: $(OBJS)
 
 libpng.a: $(OBJS)

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

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

+shared: $(LIBNAME).so.$(PNGVER)
+
+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) -rpath $(LIBPATH) \"; \
+       echo libs=\"-lpng12 -lz -lm\"; \
+       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)
+
+$(LIBNAME).so.$(PNGVER): $(OBJS)
+       $(LDSHARED) -o $@ $(OBJS)
+       rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
+

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

+       echo
+       echo Testing local static library.

        ./pngtest
 
        ./pngtest
 

-install: libpng.a
-       -@mkdir $(prefix)/include
-       -@mkdir $(prefix)/lib
-       cp png.h $(prefix)/include
-       cp pngconf.h $(prefix)/include
-       chmod 644 $(prefix)/include/png.h
-       chmod 644 $(prefix)/include/pngconf.h
-       cp libpng.a $(prefix)/lib
-       chmod 644 $(prefix)/lib/libpng.a
+install-headers: png.h pngconf.h
+       -@if [ ! -d $(DI) ]; then mkdir $(DI); fi
+       -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+       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)/* .)
+
+install-static: install-headers libpng.a
+       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+       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
+       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/libpng.so
+       -@/bin/rm -f $(DL)/libpng.so.3
+       -@/bin/rm -f $(DL)/libpng.so.3.*
+       cp $(LIBNAME).so.$(PNGVER) $(DL)
+       chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       (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 $(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
+       cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
+       chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
+       (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
+
+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
+       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
+       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
+       cp libpng-config $(DB)/$(LIBNAME)-config
+       chmod 755 $(DB)/$(LIBNAME)-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
+# move the library to its final location.
+
+test-installed:
+       echo
+       echo Testing installed dynamic shared library.
+       $(CC) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          -L$(ZLIBLIB) -rpath $(ZLIBLIB) \
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+       ./pngtesti pngtest.png

 
 clean:
 
 clean:

-       rm -f *.o libpng.a pngtest pngout.png
+       rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
+       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* so_locations
+
+DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
+writelock:
+       chmod a-w *.[ch35] $(DOCS) scripts/*

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


@@ -66,4 +200,5 @@ pngwrite.o: png.h pngconf.h
 pngwtran.o: png.h pngconf.h
 pngwutil.o: png.h pngconf.h
 pngpread.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