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

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

diff --git a/src/png/scripts/makefile.std b/src/png/scripts/makefile.std
index 9b1925d6a05c7d239aa99ca3235560dcbc05624b..a04dbb856b4d9bc705301bf8c9074cdf2a7f7ff4 100644 (file)
--- a/src/png/scripts/makefile.std
+++ b/src/png/scripts/makefile.std
@@ -1,7 +1,10 @@
 # makefile for libpng
 # Copyright (C) 2002, 2006 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # makefile for libpng
 # Copyright (C) 2002, 2006 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.

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

 
 # where make install puts libpng.a and png.h
 prefix=/usr/local
 
 # where make install puts libpng.a and png.h
 prefix=/usr/local


@@ -30,7 +33,12 @@ MKDIR_P=mkdir
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=rm -f
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=rm -f

+AWK = awk
+SED = sed
+CPP = $(CC) -E
+ECHO = echo

 
 

+DFNFLAGS = # DFNFLAGS contains -D options to use in the libpng build

 CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 
 CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 


@@ -40,6 +48,26 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 
 all: libpng.a pngtest
 
 
 all: libpng.a pngtest
 

+# The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt,
+# copy this if the following doesn't work.
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
+       $(RM_F) $@ dfn?.out
+       $(AWK) -f scripts/options.awk out=dfn1.out version=search pngconf.h\
+           scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
+       $(AWK) -f scripts/options.awk out=dfn2.out dfn1.out 1>&2
+       cp dfn2.out $@
+       $(RM_F) dfn?.out
+
+pnglibconf.h: pnglibconf.dfn
+       $(RM_F) $@ dfn.c dfn?.out
+       $(ECHO) '#include "pnglibconf.dfn"' >dfn.c
+       $(CPP) $(DFNFLAGS) dfn.c >dfn1.out
+       $(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\
+           dfn1.out >dfn2.out
+       $(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out
+       cp dfn3.out $@
+       $(RM_F) dfn.c dfn?.out
+

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


@@ -50,22 +78,25 @@ pngtest: pngtest.o libpng.a
 test: pngtest
        ./pngtest
 
 test: pngtest
        ./pngtest
 

-install: libpng.a
+install: libpng.a pnglibconf.h

        -@$(MKDIR_P) $(DESTDIR)$(INCPATH)
        -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
        -@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
        -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
        -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h
        -@$(MKDIR_P) $(DESTDIR)$(INCPATH)
        -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
        -@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
        -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
        -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h

+       -@$(RM_F) $(DESTDIR)$(INCPATH)/pnglibconf.h

        cp png.h $(DESTDIR)$(INCPATH)/libpng
        cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
        cp png.h $(DESTDIR)$(INCPATH)/libpng
        cp pngconf.h $(DESTDIR)$(INCPATH)/libpng

+       cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng

        chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
        chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
        chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
        chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h

+       chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h

        (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
        cp libpng.a $(DESTDIR)$(LIBPATH)
        chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
 
 clean:
        (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
        cp libpng.a $(DESTDIR)$(LIBPATH)
        chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
 
 clean:

-       $(RM_F) *.o libpng.a pngtest pngout.png
+       $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.* dfn.c dfn?.out

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


@@ -73,20 +104,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.h pngconf.h
-pngerror.o: png.h pngconf.h
-pngrio.o: png.h pngconf.h
-pngwio.o: png.h pngconf.h
-pngmem.o: png.h pngconf.h
-pngset.o: png.h pngconf.h
-pngget.o: png.h pngconf.h
-pngread.o: png.h pngconf.h
-pngrtran.o: png.h pngconf.h
-pngrutil.o: png.h pngconf.h
-pngtest.o: png.h pngconf.h
-pngtrans.o: png.h pngconf.h
-pngwrite.o: png.h pngconf.h
-pngwtran.o: png.h pngconf.h
-pngwutil.o: png.h pngconf.h
-pngpread.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