fix for link errors in DLL build

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

diff --git a/src/png/scripts/makefile.hpux b/src/png/scripts/makefile.hpux
index 53f99b5100b42bd03256ed3e1358bfce3b79100e..5fed4d27eda78f119dda2eaeab54c9a1d388ce1f 100644 (file)
--- a/src/png/scripts/makefile.hpux
+++ b/src/png/scripts/makefile.hpux
@@ -1,5 +1,5 @@
 # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
 # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.

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

 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 # For conditions of distribution and use, see copyright notice in png.h
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 # For conditions of distribution and use, see copyright notice in png.h


@@ -15,25 +15,40 @@ ZLIBINC=/opt/zlib/include
 #   LDSHARED=ld -b
 #   SHAREDLIB=libz.sl
 
 #   LDSHARED=ld -b
 #   SHAREDLIB=libz.sl
 

-CC=cc
-CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
-# Caution: be sure you have built zlib with the same CFLAGS.
-CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-
-RANLIB=ranlib
-
+# Library name:
+LIBNAME = libpng12

 PNGMAJ = 0
 PNGMAJ = 0

-PNGMIN = 1.2.7
+PNGMIN = 1.2.20

 PNGVER = $(PNGMAJ).$(PNGMIN)
 PNGVER = $(PNGMAJ).$(PNGMIN)

-LIBNAME = libpng12
+
+# Shared library names:
+LIBSO=$(LIBNAME).sl
+LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
+LIBSOVER=$(LIBNAME).sl.$(PNGVER)
+OLDSO=libpng.sl
+OLDSOMAJ=libpng.sl.3
+OLDSOVER=libpng.sl.3.$(PNGMIN)
+
+# Utilities:
+AR_RC=ar rc
+CC=cc
+MKDIR_P=mkdir -p
+LN_SF=ln -sf
+RANLIB=ranlib
+RM_F=/bin/rm -f

 
 # where make install puts libpng.a, libpng12.sl, and png.h
 prefix=/opt/libpng
 
 # where make install puts libpng.a, libpng12.sl, and png.h
 prefix=/opt/libpng

+exec_prefix=$(prefix)

 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
+
+CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 -DPNG_NO_MMX_CODE
+# Caution: be sure you have built zlib with the same CFLAGS.
+CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm

 
 # 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:


@@ -61,10 +76,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
        $(CC) -c $(CFLAGS) +z -o $@ $*.c
 
 .c.pic.o:
        $(CC) -c $(CFLAGS) +z -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:


@@ -80,19 +95,19 @@ libpng-config:
        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
+$(LIBSO): $(LIBSOMAJ)
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO)

 
 

-$(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER)
-       ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ)
+$(LIBSOMAJ): $(LIBSOVER)
+       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)

 
 

-$(LIBNAME).sl.$(PNGVER): $(OBJSDLL)
+$(LIBSOVER): $(OBJSDLL)

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

-       +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL)
+       +h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)

 
 

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

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

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

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


@@ -101,63 +116,63 @@ 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).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 $(LIBSOVER) libpng.pc \
+       $(OLDSOVER)
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+       -@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
+       -@$(RM_F) $(DL)/$(LIBSOMAJ)
+       -@$(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)

        (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) $(OLDSOVER) $(OLDSOMAJ); \
+       $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
+       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO))
+       -@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
 


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

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

           -L$(DL) -L$(ZLIBLIB) \
           -L$(DL) -L$(ZLIBLIB) \

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

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

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

           -L$(ZLIBLIB) \
           -L$(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)* \
+       $(OLDSOVER) \

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