[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/17] maint: list of names of built programs available in the Ma
From: |
Stefano Lattarini |
Subject: |
[PATCH 09/17] maint: list of names of built programs available in the Makefiles |
Date: |
Sun, 2 Sep 2012 21:55:11 +0200 |
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 51782a5..c06c232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -461,6 +461,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 1e1f46b..36d32e1 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)' \
--
1.7.12
- [PATCH 00/17] De-recursion for the 'tests' subdirectory., Stefano Lattarini, 2012/09/02
- [PATCH 01/17] build: use 'check-local' to extend the 'check' target, Stefano Lattarini, 2012/09/02
- [PATCH 03/17] maint: remove useless dependency for vc_exe_in_TESTS, Stefano Lattarini, 2012/09/02
- [PATCH 02/17] maint: avoid parsing of Makefile.am from vc_exe_in_TESTS, Stefano Lattarini, 2012/09/02
- [PATCH 04/17] maint: make vc_exe_in_TESTS also work in VPATH builds, Stefano Lattarini, 2012/09/02
- [PATCH 05/17] tests: use suffix, not exec-bit, to tell which files are tests, Stefano Lattarini, 2012/09/02
- [PATCH 06/17] tests: remove the unused 'root-hint' target, Stefano Lattarini, 2012/09/02
- [PATCH 08/17] maint: remove anachronistic syntax-check, Stefano Lattarini, 2012/09/02
- [PATCH 07/17] maint: remove duplicated declaration of the 'sc_check-AUTHORS' target, Stefano Lattarini, 2012/09/02
- [PATCH 09/17] maint: list of names of built programs available in the Makefiles,
Stefano Lattarini <=
- [PATCH 11/17] tests: put test-suite.log back in 'tests/', Stefano Lattarini, 2012/09/02
- [PATCH 12/17] build: remove two now-useless convenience targets, Stefano Lattarini, 2012/09/02
- [PATCH 14/17] maint: avoid a spurious syntax-check error, Stefano Lattarini, 2012/09/02
- [PATCH 13/17] maint: vc_exe_in_TESTS should actually be a syntax check, Stefano Lattarini, 2012/09/02
- [PATCH 15/17] maint: fix syntax checks 'sc_root_tests', Stefano Lattarini, 2012/09/02
- [PATCH 17/17] maint: fix a spurious syntax-check failure, Stefano Lattarini, 2012/09/02
- [PATCH 16/17] tests: more resilient about tainted absolute srcdir path, Stefano Lattarini, 2012/09/02