cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Don't install pngcp; it conflicts with pngcp in the pngtools package.

Browse Source 
Moved it from bin_PROGRAMS to check_PROGRAMS in Makefile.am so it will be
built but not installed.
This commit is contained in:
Glenn Randers-Pehrson 2016-08-13 21:23:42 -05:00
parent 2705f55221
commit 39df0ced18
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,4 +1,4 @@
Libpng 1.6.25beta02 - August 12, 2016 Libpng 1.6.25beta02 - August 14, 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.
@ -30,7 +30,8 @@ Version 1.6.25beta01 [August 12, 2016]
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate(). Conditionally compile png_inflate().
Version 1.6.25beta02 [August 12, 2016] Version 1.6.25beta02 [August 14, 2016]
Don't install pngcp; it conflicts with pngcp in the pngtools package.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -5680,7 +5680,8 @@ Version 1.6.25beta01 [August 12, 2016]
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate(). Conditionally compile png_inflate().
Version 1.6.25beta02 [August 12, 2016] Version 1.6.25beta02 [August 14, 2016]
Don't install pngcp; it conflicts with pngcp in the pngtools package.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

4
Makefile.am
View File

@ -12,13 +12,13 @@ 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 pngcp
if HAVE_CLOCK_GETTIME if HAVE_CLOCK_GETTIME
check_PROGRAMS += timepng check_PROGRAMS += timepng
endif endif
# Utilities - installed # Utilities - installed
bin_PROGRAMS= pngcp pngfix png-fix-itxt bin_PROGRAMS= pngfix png-fix-itxt
# This ensures that pnglibconf.h gets built at the start of 'make all' or # This ensures that pnglibconf.h gets built at the start of 'make all' or
# 'make check', but it does not add dependencies to the individual programs, # 'make check', but it does not add dependencies to the individual programs,