Document that wxDC::FloodFill() is not implemented under wxOSX.

[wxWidgets.git] / src / png / Makefile.am

diff --git a/src/png/Makefile.am b/src/png/Makefile.am
index 81bbba66ef37fc52000d5d9c6aee370b878e7190..def4bd117063f44c2e589abf9d4c36a6f9f67d34 100644 (file)
--- a/src/png/Makefile.am
+++ b/src/png/Makefile.am
@@ -5,31 +5,46 @@
 PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 
 # libpng does not follow GNU file name conventions
 PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 
 # libpng does not follow GNU file name conventions

+
+# "color-tests" requires automake 1.11.1 or later.  Enable it if you like,
+# to get red "FAIL" and green "PASS" notations during tests.
+# AUTOMAKE_OPTIONS = foreign color-tests

 AUTOMAKE_OPTIONS = foreign
 
 # test programs - run on make check, make distcheck
 AUTOMAKE_OPTIONS = foreign
 
 # test programs - run on make check, make distcheck

+TESTS_ENVIRONMENT= srcdir=$(srcdir)

 check_PROGRAMS= pngtest
 pngtest_SOURCES = pngtest.c
 pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 TESTS = test-pngtest.sh
 check_PROGRAMS= pngtest
 pngtest_SOURCES = pngtest.c
 pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 TESTS = test-pngtest.sh

-TESTS_ENVIRONMENT= srcdir=$(srcdir) 
+
+# Only do the following if the contrib directory is present.
+check_PROGRAMS+= pngvalid
+pngvalid_SOURCES = contrib/libtests/pngvalid.c
+pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+TESTS += test-pngvalid-simple.sh test-pngvalid-full.sh

 
 # man pages
 dist_man_MANS= libpng.3 libpngpf.3 png.5
 
 # generate the -config scripts if required
 
 # man pages
 dist_man_MANS= libpng.3 libpngpf.3 png.5
 
 # generate the -config scripts if required

-binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config 
+binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config

 EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
 bin_SCRIPTS= @binconfigs@
 
 # rules to build libpng, only build the old library on request
 lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 # EXTRA_LTLIBRARIES= libpng.la
 EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
 bin_SCRIPTS= @binconfigs@
 
 # rules to build libpng, only build the old library on request
 lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 # EXTRA_LTLIBRARIES= libpng.la

-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil.c \
-       pngtrans.c pngwutil.c \
-       pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-       pngwtran.c pngmem.c pngerror.c pngpread.c \
-       png.h pngconf.h pngpriv.h
+libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
+       pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
+       pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
+       png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
+
+if PNG_ARM_NEON
+libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/filter_neon.S
+endif
+
+nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h

 
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
 
 
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
 


@@ -37,21 +52,24 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
        -version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0
 
 if HAVE_LD_VERSION_SCRIPT
        -version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0
 
 if HAVE_LD_VERSION_SCRIPT

-  # Versioned symbols and restricted exports
+#   Versioned symbols and restricted exports
+if HAVE_SOLARIS_LD
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,-M -Wl,libpng.vers
+else

   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers

+endif
+

   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
 else
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
 else

-  # Only restricted exports when possible
+#   Only restricted exports when possible

   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
 endif
 
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
 endif
 

-# Avoid depending upon Character Ranges.
-AN = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-

 #distribute headers in /usr/include/libpng/*
 pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
 pkginclude_HEADERS= png.h pngconf.h
 #distribute headers in /usr/include/libpng/*
 pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
 pkginclude_HEADERS= png.h pngconf.h

+nodist_pkginclude_HEADERS= pnglibconf.h

 
 # pkg-config stuff, note that libpng.pc is always required in order
 # to get the correct library
 
 # pkg-config stuff, note that libpng.pc is always required in order
 # to get the correct library


@@ -62,54 +80,129 @@ pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
 EXTRA_DIST= \
        ANNOUNCE CHANGES INSTALL LICENSE README TODO \
        pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
 EXTRA_DIST= \
        ANNOUNCE CHANGES INSTALL LICENSE README TODO \
        pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \

-       ${srcdir}/projects/visualc6/* \
-       ${srcdir}/projects/visualc71/* \
-       ${srcdir}/projects/xcode/* \
-       ${srcdir}/scripts/* \
-       ${srcdir}/contrib/gregbook/* \
-       ${srcdir}/contrib/pngminim/* \
-       ${srcdir}/contrib/pngminus/* \
-       ${srcdir}/contrib/pngsuite/* \
-       ${srcdir}/contrib/visupng/* \
+       ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \

        $(TESTS) \
        $(TESTS) \

-       example.c libpng-*.txt
+       CMakeLists.txt example.c libpng-manual.txt

 
 

-CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
-libpng.sym
+SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
+
+CLEANFILES= dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
+       libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
+       check.new pnglibconf.* symbols.new pngtest-log.txt \
+       $(SCRIPT_CLEANFILES)

 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 config.sub configure depcomp install-sh ltmain.sh missing
 
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 config.sub configure depcomp install-sh ltmain.sh missing
 

+# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe
+# other operating systems (NeXT?) the C preprocessor selected by configure
+# checks input tokens for validity - effectively it performs part of the ANSI-C
+# parsing - and therefore fails with the .df files.  configure.ac has special
+# checks for this and sets DFNCPP appropriately.
+DFNCPP = @DFNCPP@
+
+SUFFIXES = .chk .dfn .out
+

 $(PNGLIB_BASENAME).pc: libpng.pc
        cp libpng.pc $@
 
 $(PNGLIB_BASENAME)-config: libpng-config
        cp libpng-config $@
 
 $(PNGLIB_BASENAME).pc: libpng.pc
        cp libpng.pc $@
 
 $(PNGLIB_BASENAME)-config: libpng-config
        cp libpng-config $@
 

-libpng.sym: png.h pngconf.h
-       rm -f $@ $@.new
-       $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
-               $(SED) -n -e \
-               's|^.*PNG_FUNCTION_EXPORT[      ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
-               -e 's|^.*PNG_DATA_EXPORT[       ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
-                       >$@.new
-       mv $@.new $@
-
-libpng.vers: libpng.sym
-       rm -f $@ $@.new
-       echo PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0 '{global:' > $@.new
-       $(SED) s/$$/\;/ libpng.sym >> $@.new
-       echo 'local: *; };' >> $@.new
-       mv $@.new $@
-
-test: check
+scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
+scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt
+
+libpng.sym: scripts/sym.out
+       rm -f $@
+       cp $? $@
+libpng.vers: scripts/vers.out
+       rm -f $@
+       cp $? $@
+pnglibconf.h: pnglibconf.out
+       rm -f $@
+       cp $? $@
+$(srcdir)/scripts/pnglibconf.h.prebuilt:
+       @echo "Attempting to build $@" >&2
+       @echo "This is a machine generated file, but if you want to make" >&2
+       @echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
+       @exit 1
+
+# The following is necessary to ensure that the local pnglibconf.h is used, not
+# an installed one (this can happen immediately after on a clean system if
+# 'make test' is the first thing the user does.)
+contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h
+
+# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
+# be built with PNG_USE_READ_MACROS; this prevents the read macros from
+# interfering with the symbol file format.
+SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
+               -DPNGLIB_VERSION='@PNGLIB_VERSION@'\
+               -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
+               -DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE
+
+.dfn.out:
+       rm -f $@ dfn.c dfn?.out
+       test -d scripts || mkdir scripts
+       echo '#include "$<"' >dfn.c
+       $(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
+           $(CPPFLAGS) $(SYMBOL_CFLAGS) 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
+       rm -f dfn.c dfn[12].out
+       mv dfn3.out $@
+
+# The .dfn file for pnglibconf.h is machine generated
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
+       rm -f $@ dfn?.out
+       $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out version=search\
+           ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
+           $(DFA_XTRA) 1>&2
+       $(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
+       rm dfn1.out
+       mv dfn2.out $@
+
+# Symbol checks (.def and .out files should match)
+scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
+.out.chk:
+       rm -f $@ symbols.new
+       $(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\
+           $< >&2
+       mv symbols.new $@
+
+# used on demand to regenerate the standard header, CPPFLAGS should
+# be empty - no non-standard defines
+scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
+       rm -f $@ dfn?.out
+       test -z "$(CPPFLAGS)"
+       echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
+       $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1
+               version=search ${srcdir}/pngconf.h -\
+               ${srcdir}/scripts/pnglibconf.dfa 1>&2
+       $(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
+       rm dfn1.out
+       mv dfn2.out $@
+
+$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
+       pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h
+
+test: check-am
+
+# Extra checks
+check: scripts/symbols.chk
+
+# Don't distribute the generated script files
+dist-hook:
+       cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES)

 
 # install the .../include headers as links to the new ones
 install-data-hook:
 
 # install the .../include headers as links to the new ones
 install-data-hook:

-       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
+       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h

        cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
        cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
                pngconf.h
        cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
        cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
                pngconf.h

+       cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \
+               pnglibconf.h

        cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
        cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
 
        cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
        cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
 


@@ -127,6 +220,8 @@ install-exec-hook:
        done
 
 uninstall-hook:
        done
 
 uninstall-hook:

-       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
+       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h

        rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
        rm -f $(DESTDIR)$(bindir)/libpng-config
        rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
        rm -f $(DESTDIR)$(bindir)/libpng-config

+       rm -f $(DESTDIR)$(libdir)/libpng.a
+       rm -f $(DESTDIR)$(libdir)/libpng.la