diff options
| author | John Bowler <jbowler@acm.org> | 2014-02-06 11:32:57 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-02-06 11:39:25 -0600 |
| commit | 414d7b5f7d6eeb8aacbffd1288d07518c2e8a539 (patch) | |
| tree | f5d0f1535853b9cef2a38e2c6f45413e48dc9c81 /Makefile.am | |
| parent | 685dff485e70cbad6f10cdc1c97c6f0d0c48f73c (diff) | |
| download | libpng-414d7b5f7d6eeb8aacbffd1288d07518c2e8a539.tar.gz | |
[libpng16] Backport recent changes from libpng-1.7.0beta30 and beta31.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e69519d71..052e596b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ ACLOCAL_AMFLAGS = -I scripts # test programs - run on make check, make distcheck -check_PROGRAMS= pngtest pngunknown pngstest pngvalid +check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage # Utilities - installed bin_PROGRAMS= pngfix png-fix-itxt @@ -34,6 +34,9 @@ pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngunknown_SOURCES = contrib/libtests/pngunknown.c pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la +pngimage_SOURCES = contrib/libtests/pngimage.c +pngimage_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la + pngfix_SOURCES = contrib/tools/pngfix.c pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la @@ -59,7 +62,8 @@ TESTS =\ 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 + tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg\ + tests/pngimage-quick tests/pngimage-full # These tests are expected, and required, to fail: XFAIL_TESTS = tests/pngstest-error @@ -212,6 +216,7 @@ pngtest.o: pnglibconf.h contrib/libtests/makepng.o: pnglibconf.h contrib/libtests/pngstest.o: pnglibconf.h contrib/libtests/pngunknown.o: pnglibconf.h +contrib/libtests/pngimage.o: pnglibconf.h contrib/libtests/pngvalid.o: pnglibconf.h contrib/libtests/readpng.o: pnglibconf.h contrib/libtests/tarith.o: pnglibconf.h |