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

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

diff --git a/src/png/scripts/makefile.dec b/src/png/scripts/makefile.dec
index 85d6e198d6cb7024f785eecb620141a1639efc32..5301d87d33eda2bbde1f19e95eea24860bc1f230 100644 (file)
--- a/src/png/scripts/makefile.dec
+++ b/src/png/scripts/makefile.dec
@@ -1,5 +1,5 @@
 # makefile for libpng on DEC Alpha Unix
 # makefile for libpng on DEC Alpha Unix

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

 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.


@@ -7,8 +7,8 @@
 # and license in png.h
 
 # Library name:
 # and license in png.h
 
 # Library name:

-PNGMAJ = 14
-LIBNAME = libpng14
+PNGMAJ = 15
+LIBNAME = libpng15

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


@@ -62,6 +62,10 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 
 all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config
 
 
 all: $(LIBSO) libpng.a 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) $@


@@ -71,7 +75,7 @@ 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!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc
+       -e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc

 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \


@@ -79,7 +83,7 @@ libpng-config:
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo ccopts=\"-std\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo ccopts=\"-std\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \

-       echo libs=\"-lpng14 -lz -lm\"; \
+       echo libs=\"-lpng15 -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
 


@@ -96,12 +100,12 @@ pngtest: pngtest.o libpng.a
 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
-       -@/bin/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
+       -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h

        -@/bin/rm -f $(DI)/libpng
        (cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .)
 
        -@/bin/rm -f $(DI)/libpng
        (cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .)
 


@@ -175,24 +179,24 @@ test-installed:
 clean:
        /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
        libpng-config $(LIBSO) $(LIBSOMAJ)* \
 clean:
        /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
        libpng-config $(LIBSO) $(LIBSOMAJ)* \

-       libpng.pc
+       libpng.pc pnglibconf.h

 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

-png.o: png.h pngconf.h pngpriv.h
-pngerror.o: png.h pngconf.h pngpriv.h
-pngrio.o: png.h pngconf.h pngpriv.h
-pngwio.o: png.h pngconf.h pngpriv.h
-pngmem.o: png.h pngconf.h pngpriv.h
-pngset.o: png.h pngconf.h pngpriv.h
-pngget.o: png.h pngconf.h pngpriv.h
-pngread.o: png.h pngconf.h pngpriv.h
-pngrtran.o: png.h pngconf.h pngpriv.h
-pngrutil.o: png.h pngconf.h pngpriv.h
-pngtrans.o: png.h pngconf.h pngpriv.h
-pngwrite.o: png.h pngconf.h pngpriv.h
-pngwtran.o: png.h pngconf.h pngpriv.h
-pngwutil.o: png.h pngconf.h pngpriv.h
-pngpread.o: png.h pngconf.h pngpriv.h
-
-pngtest.o: png.h pngconf.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+
+pngtest.o: png.h pngconf.h pnglibconf.h