Fit the generic preferences editor dialog to its pages size initially.

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

diff --git a/src/png/scripts/makefile.linux b/src/png/scripts/makefile.linux
index 3a52133297b70f5a8f5ac717458cc21febd215a4..8e3991ad6acafa7be8e9bd3373c2dc12e6f3fa6d 100644 (file)
--- a/src/png/scripts/makefile.linux
+++ b/src/png/scripts/makefile.linux
@@ -1,5 +1,5 @@
-# makefile for libpng.a and libpng14.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs and
+# makefile for libpng.a and libpng15.so on Linux ELF with gcc
+# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and

 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #


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

-LIBNAME = libpng14
-PNGMAJ = 14
-RELEASE = 4
+LIBNAME = libpng15
+PNGMAJ = 15
+RELEASE = 7

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


@@ -26,8 +26,8 @@ LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
 
 RANLIB=ranlib
 RM_F=/bin/rm -f
 

-# where "make install" puts libpng14.a, libpng14.so*,
-# libpng14/png.h and libpng14/pngconf.h
+# where "make install" puts libpng15.a, libpng15.so*,
+# libpng15/png.h, libpng15/pngconf.h, and libpng15/pnglibconf.h

 # Prefix must be a full pathname.
 prefix=/usr/local
 exec_prefix=$(prefix)
 # Prefix must be a full pathname.
 prefix=/usr/local
 exec_prefix=$(prefix)


@@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
 CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 
 CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \
        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 

-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm
+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng15 -lz -lm

 LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
 
 INCPATH=$(prefix)/include
 LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
 
 INCPATH=$(prefix)/include


@@ -87,6 +87,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 
 all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
 
 
 all: libpng.a $(LIBSO) pngtest pngtest-static 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) $@


@@ -96,7 +100,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; \


@@ -104,7 +108,7 @@ libpng-config:
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
        echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
        echo R_opts=\"-Wl,-rpath,$(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
 


@@ -130,12 +134,12 @@ test: pngtest pngtest-static
        @echo ""
        ./pngtest-static
 
        @echo ""
        ./pngtest-static
 

-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)/* .)
 


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

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


@@ -216,20 +220,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 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
+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
 
 pngtest.o: png.h pngconf.h