]> git.saurik.com Git - wxWidgets.git/blobdiff - src/png/Makefile.am
The alignment controls are now left-aligned if the floating controls are not shown.
[wxWidgets.git] / src / png / Makefile.am
index 81bbba66ef37fc52000d5d9c6aee370b878e7190..a2cd2c10bb33a7c100dbe69f28235512798c8723 100644 (file)
 
 PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 
-# libpng does not follow GNU file name conventions
-AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I scripts
 
 # test programs - run on make check, make distcheck
-check_PROGRAMS= pngtest
+check_PROGRAMS= pngtest pngunknown pngstest pngvalid
+
 pngtest_SOURCES = pngtest.c
 pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-TESTS = test-pngtest.sh
-TESTS_ENVIRONMENT= srcdir=$(srcdir) 
+
+pngvalid_SOURCES = contrib/libtests/pngvalid.c
+pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+
+pngstest_SOURCES = contrib/libtests/pngstest.c
+pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+
+pngunknown_SOURCES = contrib/libtests/pngunknown.c
+pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+
+# Generally these are single line shell scripts to run a test with a particular
+# set of parameters:
+TESTS =\
+   tests/pngtest\
+   tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
+   tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
+   tests/pngvalid-gamma-expand16-background\
+   tests/pngvalid-gamma-expand16-transform tests/pngvalid-gamma-sbit\
+   tests/pngvalid-gamma-threshold tests/pngvalid-gamma-transform\
+   tests/pngvalid-progressive-interlace-size\
+   tests/pngvalid-progressive-interlace-standard\
+   tests/pngvalid-progressive-interlace-transform\
+   tests/pngvalid-progressive-standard tests/pngvalid-standard\
+   tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\
+   tests/pngstest-0g08 tests/pngstest-0g16 tests/pngstest-2c08\
+   tests/pngstest-2c16 tests/pngstest-3p01 tests/pngstest-3p02\
+   tests/pngstest-3p04 tests/pngstest-3p08 tests/pngstest-4a08\
+   tests/pngstest-4a16 tests/pngstest-6a08 tests/pngstest-6a16\
+   tests/pngstest-error tests/pngunknown-IDAT\
+   tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\
+   tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg
+
+# These tests are expected, and required, to fail:
+XFAIL_TESTS = tests/pngstest-error
 
 # 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
-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 pngusr.dfa
+
+if PNG_ARM_NEON
+libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\
+       arm/filter_neon.S
+endif
 
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
+nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
 
 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
-  # 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
+endif
+
   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
 
-# Avoid depending upon Character Ranges.
-AN = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-
 #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
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
 
-#extra source distribution files.
+# Extra source distribution files, '${srcdir}' is used below to stop build files
+# from those directories being included.  This only works if the configure is
+# not done in the source directory!
 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/* \
-       $(TESTS) \
-       example.c libpng-*.txt
-
-CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
-libpng.sym
+       ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
+       $(TESTS) $(XFAIL_TESTS) tests/pngstest \
+       CMakeLists.txt example.c libpng-manual.txt
+
+SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
+
+CLEANFILES= *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
+       libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
+       check.new pnglibconf.* pngprefix.h 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
 
+# PNG_COPTS give extra options for the C compiler to be used on all compilation
+# steps (unless targe_CFLAGS is specified; that will take precedence over
+# AM_CFLAGS)
+PNG_COPTS = @PNG_COPTS@
+AM_CFLAGS = ${PNG_COPTS}
+
+# 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 $@
 
-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 $@
+scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
+scripts/prefix.out: png.h pngconf.h pnglibconf.out
+scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt
+scripts/intprefix.out: pnglibconf.h
+
+libpng.sym: scripts/sym.out
+       rm -f $@
+       cp $? $@
+libpng.vers: scripts/vers.out
+       rm -f $@
+       cp $? $@
+
+if DO_PNG_PREFIX
+# Rename functions in scripts/prefix.out with a PNG_PREFIX prefix.
+# Rename macros in scripts/macro.lst from PNG_PREFIXpng_ to PNG_ (the actual
+# implementation of the macro).
+pnglibconf.h: pnglibconf.out scripts/prefix.out scripts/macro.lst
+       rm -f $@
+       $(AWK) 's==0 && NR>1{print prev}\
+          s==0{prev=$$0}\
+          s==1{print "#define", $$1, "@PNG_PREFIX@" $$1}\
+          s==2{print "#define @PNG_PREFIX@png_" $$1, "PNG_" $$1}\
+          END{print prev}' s=0 pnglibconf.out s=1 scripts/prefix.out\
+          s=2 ${srcdir}/scripts/macro.lst >pnglibconf.tf8
+       mv pnglibconf.tf8 $@
+
+pngprefix.h: scripts/intprefix.out
+       rm -f pngprefix.tf1
+       $(AWK) '{print "#define", $$1, "@PNG_PREFIX@" $$1}' $? >pngprefix.tf1
+       mv pngprefix.tf1 $@
+else
+pnglibconf.h: pnglibconf.out
+       rm -f $@
+       cp $? $@
+
+pngprefix.h: # is empty
+       :>$@
+endif
+
+$(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/pngstest.o contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h
+contrib/libtests/pngunknown.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
+
+if DO_PNG_PREFIX
+SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@'
+endif
+
+.dfn.out:
+       rm -f $@ $*.c $*.tf[12]
+       test -d scripts || mkdir scripts || test -d scripts
+       echo '#include "$<"' >$*.c
+       $(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
+           $(CPPFLAGS) $(SYMBOL_CFLAGS) $*.c > $*.tf1
+       $(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2
+       rm -f $*.c $*.tf1
+       mv $*.tf2 $@
+
+# The .dfn file for pnglibconf.h is machine generated
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
+       rm -f $@ $*.tf[45]
+       $(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\
+           ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
+           ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
+       $(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf5 $*.tf4 1>&2
+       rm $*.tf4
+       mv $*.tf5 $@
+
+# Symbol checks (.def and .out files should match)
+scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
+
+.out.chk:
+       rm -f $@ $*.new
+       $(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\
+           of="$*.new" $< >&2
+       mv $*.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 $@ pnglibconf.tf[67]
+       test -z "$(CPPFLAGS)"
+       echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
+       $(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf6\
+           logunsupported=1 version=search ${srcdir}/pngconf.h -\
+           ${srcdir}/scripts/pnglibconf.dfa 1>&2
+       $(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf7\
+           pnglibconf.tf6 1>&2
+       rm pnglibconf.tf6
+       mv pnglibconf.tf7 $@
+
+$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
+       pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h pngprefix.h
+
+test: check-am
 
-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 $@
+# Extra checks
+check: scripts/symbols.chk
 
-test: check
+# 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:
-       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
-       cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
-       cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/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)$(pkgconfigdir); rm -f libpng.pc
-       cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
+       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
 
 # do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ to be used
 install-exec-hook:
-       cd $(DESTDIR)$(bindir); rm -f libpng-config
-       cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
+       cd '$(DESTDIR)$(bindir)'; rm -f libpng-config
+       cd '$(DESTDIR)$(bindir)';\
+          $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
        @set -x;\
-       cd $(DESTDIR)$(libdir);\
-       for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ sl dylib dll.a; do\
+       cd '$(DESTDIR)$(libdir)';\
+       for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@\
+          sl dylib dll.a; do\
                rm -f libpng.$$ext;\
                 if test -f $(PNGLIB_BASENAME).$$ext; then\
                        $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
@@ -127,6 +283,13 @@ install-exec-hook:
        done
 
 uninstall-hook:
-       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
-       rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
-       rm -f $(DESTDIR)$(bindir)/libpng-config
+       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)$(libdir)/libpng.a'
+       rm -f '$(DESTDIR)$(libdir)/libpng.la'
+       rm -f '$(DESTDIR)$(libdir)/libpng.so'
+       rm -f '$(DESTDIR)$(libdir)/libpng.so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@'
+       rm -f '$(DESTDIR)$(libdir)/libpng.sl'
+       rm -f '$(DESTDIR)$(libdir)/libpng.dylib'
+       rm -f '$(DESTDIR)$(libdir)/libpng.dll.a'