guard against nullptr

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

diff --git a/src/png/scripts/makefile.hpgcc b/src/png/scripts/makefile.hpgcc
index 6b51229383ee0b109310983818731417f3f354e9..55976f61ed7da90215a486c7f36ef7bf6f791786 100644 (file)
--- a/src/png/scripts/makefile.hpgcc
+++ b/src/png/scripts/makefile.hpgcc
@@ -1,23 +1,22 @@
 # makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
-# Copyright (C) 2002, 2006-2008 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
-# 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).sl
 LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
-LIBSOVER=$(LIBNAME).sl.$(PNGVER)
+LIBSOREL=$(LIBSOMAJ).$(RELEASE)
 OLDSO=libpng.sl
-OLDSOMAJ=libpng.sl.3
-OLDSOVER=libpng.sl.3.$(PNGMIN)
 
 # Utilities:
 CC=gcc
@@ -55,8 +54,8 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 
 CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
        $(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
+#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -100,29 +99,22 @@ 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; \
        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
 
 $(LIBSO): $(LIBSOMAJ)
        $(LN_SF) $(LIBSOMAJ) $(LIBSO)
 
-$(LIBSOMAJ): $(LIBSOVER)
-       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
-
-$(LIBSOVER): $(OBJSDLL)
-       $(LD) -b +s \
-       +h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)
-
-$(OLDSOVER): $(OBJSDLL)
+$(LIBSOMAJ): $(OBJSDLL)
        $(LD) -b +s \
-       +h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL)
+       +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBSO)
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -147,23 +139,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
@@ -217,7 +202,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
@@ -226,20 +210,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