diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-08-13 21:23:42 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-08-13 21:23:42 -0500 |
| commit | 39df0ced1893caa2d2ee36f422200dfd49cc50a0 (patch) | |
| tree | 3fd43f31364a462396ea4493cfb5271ebeead0c9 | |
| parent | 2705f55221073b837eeab0dd5fe05337689ee773 (diff) | |
| download | libpng-39df0ced1893caa2d2ee36f422200dfd49cc50a0.tar.gz | |
[libpng16] Don't install pngcp; it conflicts with pngcp in the pngtools package.
Moved it from bin_PROGRAMS to check_PROGRAMS in Makefile.am so it will be
built but not installed.
| -rw-r--r-- | ANNOUNCE | 5 | ||||
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | Makefile.am | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -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 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. 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 (subscription required; visit @@ -5680,7 +5680,8 @@ Version 1.6.25beta01 [August 12, 2016] Cleaned up PNG_DEBUG compile of pngtest.c. 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 (subscription required; visit diff --git a/Makefile.am b/Makefile.am index 39e9bdeed..74ca36b10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,13 +12,13 @@ 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 pngimage +check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp if HAVE_CLOCK_GETTIME check_PROGRAMS += timepng endif # 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 # 'make check', but it does not add dependencies to the individual programs, |