[libpng17] Update Makefile.am, fix typo in timepng.c

This commit is contained in:
Glenn Randers-Pehrson 2016-05-16 19:39:55 -05:00
parent f05407d292
commit bd6fb5534f
3 changed files with 10 additions and 5 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta81 - May 16, 2016 Libpng 1.7.0beta81 - May 17, 2016
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.

View File

@ -1,3 +1,5 @@
< contrib/libtests/timepng.o: pnglibconf.h
# Makefile.am: # Makefile.am:
# Source file for Makefile.in (and hence Makefile) # Source file for Makefile.in (and hence Makefile)
# #
@ -7,7 +9,7 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
ACLOCAL_AMFLAGS = -I scripts ACLOCAL_AMFLAGS = -I scripts
# test programs - run on make check, make distcheck # test programs - run on make check, make distcheck
check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage timepng
# Utilities - installed # Utilities - installed
bin_PROGRAMS= pngfix png-fix-itxt bin_PROGRAMS= pngfix png-fix-itxt
@ -42,6 +44,9 @@ pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
png_fix_itxt_SOURCES = contrib/tools/png-fix-itxt.c png_fix_itxt_SOURCES = contrib/tools/png-fix-itxt.c
timepng_SOURCES = contrib/libtests/timepng.c
timepng_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
# Generally these are single line shell scripts to run a test with a particular # Generally these are single line shell scripts to run a test with a particular
# set of parameters: # set of parameters:
TESTS =\ TESTS =\

View File

@ -44,9 +44,9 @@
# define voidcast(type, value) (value) # define voidcast(type, value) (value)
#endif /* __cplusplus */ #endif /* __cplusplus */
#if (defined (CLOCK_PROCESS_CPUTIME_ID) && #if defined (CLOCK_PROCESS_CPUTIME_ID) && \
defined (PNG_SEQUENTIAL_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)\ defined (PNG_SEQUENTIAL_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED) \
&& defined(PNG_EASY_ACCESS_SUPPORTED) && defined(PNG_INFO_IMAGE_SUPPORTED) && defined(PNG_EASY_ACCESS_SUPPORTED) && defined(PNG_INFO_IMAGE_SUPPORTED)
typedef struct typedef struct
{ {