Don't auto-link with 3rd party libraries in DLL build using MSVC.

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

diff --git a/src/png/scripts/makefile.solaris b/src/png/scripts/makefile.solaris
index e71bd83358f989763085f04c2e08b9ba7c397a92..24bd61033cedabb1b969ebe8e1c4c2e19807da8a 100644 (file)
--- a/src/png/scripts/makefile.solaris
+++ b/src/png/scripts/makefile.solaris
@@ -1,23 +1,22 @@
 # makefile for libpng on Solaris 2.x with gcc
 # makefile for libpng on Solaris 2.x with gcc

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

 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1998 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:
 
 # Library name:

-LIBNAME = libpng12
-PNGMAJ = 0
-PNGMIN = 1.2.34
-PNGVER = $(PNGMAJ).$(PNGMIN)
+LIBNAME = libpng15
+PNGMAJ = 15

 
 # Shared library names:
 LIBSO=$(LIBNAME).so
 LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
 
 # Shared library names:
 LIBSO=$(LIBNAME).so
 LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)

-LIBSOVER=$(LIBNAME).so.$(PNGVER)
+LIBSOREL=$(LIBSOMAJ).$(RELEASE)

 OLDSO=libpng.so
 OLDSO=libpng.so

-OLDSOMAJ=libpng.so.3
-OLDSOVER=libpng.so.3.$(PNGMIN)

 
 # Utilities:
 AR_RC=ar rc
 
 # Utilities:
 AR_RC=ar rc


@@ -27,7 +26,7 @@ LN_SF=ln -f -s
 RANLIB=echo
 RM_F=/bin/rm -f
 
 RANLIB=echo
 RM_F=/bin/rm -f
 

-# Where make install puts libpng.a, libpng12.so*, and png.h
+# Where make install puts libpng.a, libpng15.so*, and png.h

 prefix=/usr/local
 exec_prefix=$(prefix)
 
 prefix=/usr/local
 exec_prefix=$(prefix)
 


@@ -44,9 +43,8 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
        -Wmissing-declarations -Wtraditional -Wcast-align \
        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) -W -Wall -O \
        -Wmissing-declarations -Wtraditional -Wcast-align \
        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) -W -Wall -O \

-       -DPNG_NO_MMX_CODE; \

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

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

 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib


@@ -81,6 +79,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 

+# see scripts/pnglibconf.mak for more options
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+       cp scripts/pnglibconf.h.prebuilt $@
+

 libpng.a: $(OBJS)
        $(AR_RC) $@ $(OBJS)
        $(RANLIB) $@
 libpng.a: $(OBJS)
        $(AR_RC) $@ $(OBJS)
        $(RANLIB) $@


@@ -90,26 +92,23 @@ libpng.pc:
        -e s!@exec_prefix@!$(exec_prefix)! \
        -e s!@libdir@!$(LIBPATH)! \
        -e s!@includedir@!$(INCPATH)! \
        -e s!@exec_prefix@!$(exec_prefix)! \
        -e s!@libdir@!$(LIBPATH)! \
        -e s!@includedir@!$(INCPATH)! \

-       -e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc
+       -e s!-lpng15!-lpng15\ -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 cppflags=\"-DPNG_NO_MMX_CODE\"; \
+       echo cppflags=\"\"; \

        echo L_opts=\"-L$(LIBPATH)\"; \
        echo R_opts=\"-R$(LIBPATH)\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
        echo R_opts=\"-R$(LIBPATH)\"; \

-       echo libs=\"-lpng12 -lz -lm\"; \
+       echo libs=\"-lpng15 -lz -lm\"; \

        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
 $(LIBSO): $(LIBSOMAJ)
        $(LN_SF) $(LIBSOMAJ) $(LIBSO)
 
        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)
+$(LIBSOMAJ): $(OBJSDLL)

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


@@ -123,11 +122,7 @@ $(LIBSOVER): $(OBJSDLL)
        ;; \
        esac
        $(LD) -G -h $(LIBSOMAJ) \
        ;; \
        esac
        $(LD) -G -h $(LIBSOMAJ) \

-        -o $(LIBSOVER) $(OBJSDLL)
-
-$(OLDSOVER): $(OBJS)
-       $(LD) -G -h $(OLDSOMAJ) \
-        -o $(OLDSOVER) $(OBJSDLL)
+        -o $(LIBSOMAJ) $(OBJSDLL)

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


@@ -135,12 +130,12 @@ pngtest: pngtest.o $(LIBSO)
 test: pngtest
        ./pngtest
 
 test: pngtest
        ./pngtest
 

-install-headers: png.h pngconf.h
+install-headers: png.h pngconf.h pnglibconf.h

        -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
        -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(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
-       -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
+       cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
+       chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
+       -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h

        -@$(RM_F) $(DI)/libpng
        (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
 
        -@$(RM_F) $(DI)/libpng
        (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
 


@@ -151,23 +146,16 @@ install-static: install-headers libpng.a
        -@$(RM_F) $(DL)/libpng.a
        (cd $(DL); $(LN_SF) $(LIBNAME).a 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
        -@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)/$(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); \
        (cd $(DL); \

-       $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
-       $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
-       $(LN_SF) $(LIBSOVER) $(LIBSO); \
-       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ))
+       $(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
        -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
        -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
        -@$(RM_F) $(DL)/pkgconfig/libpng.pc


@@ -221,8 +209,7 @@ test-installed:
 clean:
        $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
        libpng-config $(LIBSO) $(LIBSOMAJ)* \
 clean:
        $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
        libpng-config $(LIBSO) $(LIBSOMAJ)* \

-       $(OLDSOVER) \
-       libpng.pc
+       libpng.pc pnglibconf.h

 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:


@@ -230,20 +217,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
-
-pngtest.o: png.h pngconf.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+
+pngtest.o: png.h pngconf.h pnglibconf.h