From 24fb6d91b6b5b460d5d0b4f5c76d4a954f928040 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 2 Sep 2012 21:55:11 +0200
Subject: [PATCH] maint: list of names of built programs available in the
 Makefiles

This is just a preparatory refactoring in view of future changes.

* configure.ac (AC_SUBST): New 'built_programs'.
* tests/Makefile.am (AM_TESTS_ENVIRONMENT): Simply define the exported
variable 'built_programs' to the expansion of the '$(built_programs)'
AC_SUBST'd make variable.
(.built-programs): Remove this now-unneeded convenience target.
(CLEANFILES, check_DATA): Delete, no longer needed.
---
 configure.ac      |  2 ++
 tests/Makefile.am | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 627920dcb9..5e8ce24b1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,6 +462,8 @@ AC_SUBST([pkglibexec_PROGRAMS]) AM_SUBST_NOTMAKE([pkglibexec_PROGRAMS])
 AC_SUBST([man1_MANS])           AM_SUBST_NOTMAKE([man1_MANS])
 AC_SUBST([EXTRA_MANS])          AM_SUBST_NOTMAKE([EXTRA_MANS])
 
+AC_SUBST([built_programs], [$optional_bin_progs])
+
 AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
 
 ############################################################################
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2ef2f10fa2..56ca499b73 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,14 +39,6 @@ vc_exe_in_TESTS:
 check-local: vc_exe_in_TESTS
 .PHONY: vc_exe_in_TESTS
 
-CLEANFILES =
-CLEANFILES += .built-programs
-check_DATA = .built-programs
-.built-programs: $(top_srcdir)/Makefile.am
-	$(AM_V_GEN)(cd $(top_builddir)					\
-            && MAKEFLAGS= $(MAKE) -s built_programs.list)		\
-          | sed s,^src/,, > $@-t && mv $@-t $@
-
 TEST_EXTENSIONS = .sh .pl .xpl
 
 if HAVE_PERL
@@ -86,7 +78,7 @@ AM_TESTS_ENVIRONMENT =				\
   abs_top_builddir='$(abs_top_builddir)'	\
   abs_top_srcdir='$(abs_top_srcdir)'		\
   abs_srcdir='$(abs_srcdir)'			\
-  built_programs="`cat .built-programs`"	\
+  built_programs='$(built_programs)'		\
   host_os=$(host_os)				\
   host_triplet='$(host_triplet)'		\
   srcdir='$(srcdir)'				\
-- 
2.47.2