From b152f8b6c5e756404073fa053f88955cc9a1def2 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 29 Dec 2013 15:26:45 -0600 Subject: [PATCH] [libpng15] The 'make all-am' command no longer builds $(check_PROGRAMS), leading to a lack of checks on cross-builds such as ARM. Makefile.am also requires correct dependencies for the check programs on pnglibconf.h otherwise parallel builds on fast machines can sometimes pick up the system pnglibconf.h. --- ANNOUNCE | 5 +++++ CHANGES | 5 +++++ Makefile.am | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE index 47cded0a8..c338e80cc 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -51,6 +51,11 @@ Version 1.5.18beta03 [December 29, 2013] Merged pngvalid and pngtest from libpng-1.5; made compressed chunks after IDAT work with the progressive read code (this is a minor and somewhat ugly fix-up; the proper fix is in 1.6). + The 'make all-am' command no longer builds $(check_PROGRAMS), leading + to a lack of checks on cross-builds such as ARM. Makefile.am also + requires correct dependencies for the check programs on pnglibconf.h + otherwise parallel builds on fast machines can sometimes pick up the + system pnglibconf.h. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 59fe92234..8b1a53466 100644 --- a/CHANGES +++ b/CHANGES @@ -4175,6 +4175,11 @@ Version 1.5.18beta03 [December 29, 2013] Merged pngvalid and pngtest from libpng-1.5; made compressed chunks after IDAT work with the progressive read code (this is a minor and somewhat ugly fix-up; the proper fix is in 1.6). + The 'make all-am' command no longer builds $(check_PROGRAMS), leading + to a lack of checks on cross-builds such as ARM. Makefile.am also + requires correct dependencies for the check programs on pnglibconf.h + otherwise parallel builds on fast machines can sometimes pick up the + system pnglibconf.h. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/Makefile.am b/Makefile.am index c3fb718de..500049a0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,7 +132,7 @@ $(srcdir)/scripts/pnglibconf.h.prebuilt: # 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/pngvalid.o pngtest.o: pnglibconf.h +pngvalid.o pngtest.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 @@ -230,3 +230,8 @@ uninstall-hook: rm -f '$(DESTDIR)$(libdir)/libpng.sl' rm -f '$(DESTDIR)$(libdir)/libpng.dylib' rm -f '$(DESTDIR)$(libdir)/libpng.dll.a' + +# The following addition ensures that 'make all' always builds the test programs +# too. It used to, but some change either in libpng or configure stopped this +# working. +all-am: $(check_PROGRAMS)