Use wxPENSTYLE_XXX and wxBRUSHSTYLE_XXX instead of wxXXX constants.

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

diff --git a/src/png/scripts/makefile.hpgcc b/src/png/scripts/makefile.hpgcc
index fd79e1bf3db175ca2295c2f4c84bc1460b535248..55976f61ed7da90215a486c7f36ef7bf6f791786 100644 (file)
--- a/src/png/scripts/makefile.hpgcc
+++ b/src/png/scripts/makefile.hpgcc
@@ -1,15 +1,35 @@
 # makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
 # makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.

-# Copyright (C) 2002, Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006-2008, 2010 Glenn Randers-Pehrson

 # Copyright (C) 2001, Laurent faillie
 # Copyright (C) 1998, 1999 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 # Copyright (C) 2001, Laurent faillie
 # Copyright (C) 1998, 1999 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 = libpng14
+PNGMAJ = 14
+
+# Shared library names:
+LIBSO=$(LIBNAME).sl
+LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
+LIBSOREL=$(LIBSOMAJ).$(RELEASE)
+OLDSO=libpng.sl

 
 

+# Utilities:

 CC=gcc
 LD=ld
 CC=gcc
 LD=ld

+AR_RC=ar rc
+MKDIR_P=mkdir -p
+LN_SF=ln -sf
+RANLIB=ranlib
+RM_F=/bin/rm -f

 
 

-# where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h
+# where "make install" puts libpng.a, $(OLDSO)*, png.h and pngconf.h

 prefix=/usr/local
 prefix=/usr/local

+exec_prefix=$(prefix)

 
 # Where the zlib library and include files are located
 ZLIBLIB=/opt/zlib/lib
 
 # Where the zlib library and include files are located
 ZLIBLIB=/opt/zlib/lib


@@ -32,23 +52,15 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 
 
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 

-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \

        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5

-#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
-
-RANLIB=ranlib
-#RANLIB=echo
-
-PNGMAJ = 0
-PNGMIN = 1.2.7
-PNGVER = $(PNGMAJ).$(PNGMIN)
-LIBNAME = libpng12
+#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm

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

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

 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:


@@ -76,38 +88,35 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
        $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
 
 .c.pic.o:
        $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
 

-all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config

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

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

        $(RANLIB) $@
 
 libpng.pc:
        $(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; \
        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 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).sl: $(LIBNAME).sl.$(PNGMAJ)
-       ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl
-
-$(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER)
-       ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ)
-
-$(LIBNAME).sl.$(PNGVER): $(OBJSDLL)
-       $(LD) -b +s \
-       +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL)
+$(LIBSO): $(LIBSOMAJ)
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO)

 
 

-libpng.sl.3.$(PNGMIN): $(OBJSDLL)
+$(LIBSOMAJ): $(OBJSDLL)

        $(LD) -b +s \
        $(LD) -b +s \

-       +h libpng.sl.3 -o libpng.sl.3.$(PNGMIN) $(OBJSDLL)
+       +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)

 
 

-pngtest: pngtest.o $(LIBNAME).sl
+pngtest: pngtest.o $(LIBSO)

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


@@ -115,63 +124,56 @@ test: pngtest
 
 
 install-headers: png.h pngconf.h
 
 
 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).sl.$(PNGVER) libpng.pc \
-       libpng.sl.3.$(PNGMIN)
-       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/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)
+       -@$(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.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
-       -@/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
 
 
 install: install-static install-shared install-man install-config
 


@@ -183,24 +185,23 @@ test-dd:
        echo
        echo Testing installed dynamic shared library in $(DL).
        $(CC) -I$(DI) -I$(ZLIBINC) \
        echo
        echo Testing installed dynamic shared library in $(DL).
        $(CC) -I$(DI) -I$(ZLIBINC) \

-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
-          -L$(DL) -L$(ZLIBLIB) -W1,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) -Wl,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`

        ./pngtestd pngtest.png
 
 test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) -I$(ZLIBINC) \
        ./pngtestd pngtest.png
 
 test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) -I$(ZLIBINC) \

-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \

           -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
           -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \

-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`

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

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

        libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
        libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO


@@ -209,20 +210,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.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
 
 pngtest.o: png.h pngconf.h