remove also wxT(); it's confusing, too; do load wxstd.mo catalog after calling wxLoca...

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

diff --git a/src/png/scripts/makefile.so9 b/src/png/scripts/makefile.so9
index 0713b9798a3ced58f69c3c874522676f5829a527..8f1633753d3a35cb996692066c4af7b82304e25d 100644 (file)
--- a/src/png/scripts/makefile.so9
+++ b/src/png/scripts/makefile.so9
@@ -1,16 +1,37 @@
 # makefile for libpng on Solaris 9 (beta) with Forte cc
 # Updated by Chad Schrock for Solaris 9
 # Contributed by William L. Sebok, based on makefile.linux
 # makefile for libpng on Solaris 9 (beta) with Forte cc
 # Updated by Chad Schrock for Solaris 9
 # Contributed by William L. Sebok, based on makefile.linux

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

 # Copyright (C) 1998-2001 Greg Roelofs
 # Copyright (C) 1996-1997 Andreas Dilger
 # For conditions of distribution and use, see copyright notice in png.h
 
 # Copyright (C) 1998-2001 Greg Roelofs
 # Copyright (C) 1996-1997 Andreas Dilger
 # For conditions of distribution and use, see copyright notice in png.h
 

+# Library name:
+PNGMAJ = 0
+PNGMIN = 1.2.20
+PNGVER = $(PNGMAJ).$(PNGMIN)
+LIBNAME = libpng12
+
+# Shared library names:
+LIBSO=$(LIBNAME).so
+LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
+LIBSOVER=$(LIBNAME).so.$(PNGVER)
+OLDSO=libpng.so
+OLDSOMAJ=libpng.so.3
+OLDSOVER=libpng.so.3.$(PNGMIN)
+
+# Utilities:

 # gcc 2.95 doesn't work.
 CC=cc
 # gcc 2.95 doesn't work.
 CC=cc

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

 
 

-# Where make install puts libpng.a, libpng.so*, and png.h
+# Where make install puts libpng.a, $(OLDSO)*, and png.h

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

+exec_prefix=$(prefix)

 
 # Where the zlib library and include files are located
 # Changing these to ../zlib poses a security risk.  If you want
 
 # Where the zlib library and include files are located
 # Changing these to ../zlib poses a security risk.  If you want


@@ -26,22 +47,14 @@ ZLIBINC=/usr/include
 #WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
        -Wmissing-declarations -Wtraditional -Wcast-align \
        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 #WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
        -Wmissing-declarations -Wtraditional -Wcast-align \
        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion

-#CFLAGS=-I$(ZLIBINC) -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5
-CFLAGS=-I$(ZLIBINC) -O3
+#CFLAGS=-I$(ZLIBINC) -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE
+CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE

 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 
 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 

-#RANLIB=ranlib
-RANLIB=echo
-
-PNGMAJ = 0
-PNGMIN = 1.2.4
-PNGVER = $(PNGMAJ).$(PNGMIN)
-LIBNAME = libpng12
-

 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:


@@ -69,10 +82,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
        $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
 
 .c.pic.o:
        $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
 

-all: libpng.a $(LIBNAME).so 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:


@@ -81,20 +94,20 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \

-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-L$(LIBPATH) -R$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-R$(LIBPATH)\"; \

        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 

-$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
-       ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
+$(LIBSO): $(LIBSOMAJ)
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO)

 
 

-$(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
-       ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
+$(LIBSOMAJ): $(LIBSOVER)
+       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)

 
 

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

        @case "`type ld`" in *ucb*) \
        echo; \
        echo '## WARNING:'; \
        @case "`type ld`" in *ucb*) \
        echo; \
        echo '## WARNING:'; \


@@ -107,88 +120,107 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        echo; \
        ;; \
        esac
        echo; \
        ;; \
        esac

-       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz
+       $(LD) -G -h $(LIBSOMAJ) \
+        -o $(LIBSOVER) $(OBJSDLL)

 
 

-pngtest: pngtest.o $(LIBNAME).so
+$(OLDSOVER): $(OBJS)
+       $(LD) -G -h $(OLDSOMAJ) \
+        -o $(OLDSOVER) $(OBJSDLL)
+
+pngtest: pngtest.o $(LIBSO)

        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 test: pngtest
        ./pngtest
 
 install-headers: png.h pngconf.h
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 test: pngtest
        ./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 -f -s $(LIBNAME) libpng; ln -f -s $(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 -f -s $(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)
+       -@$(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 -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
-       ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
-       ln -f -s $(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) $(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 -f -s $(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 \
+          -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \
+          -L$(DL) -L$(ZLIBLIB)  -R$(ZLIBLIB) -R$(DL)
+       ./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 --cppflags --cflags` pngtest.c \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
+          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \

           -L$(ZLIBLIB) -R$(ZLIBLIB)
        ./pngtesti pngtest.png
 
 clean:
           -L$(ZLIBLIB) -R$(ZLIBLIB)
        ./pngtesti pngtest.png
 
 clean:

-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)*
+       $(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
 writelock:
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock: