summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/Makefile.in9
-rw-r--r--src/Makefile.in13
-rw-r--r--tests/Makefile.in6
-rw-r--r--tests/rm/Makefile.in1
4 files changed, 14 insertions, 15 deletions
diff --git a/man/Makefile.in b/man/Makefile.in
index 75a613b27..cc395bddf 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -295,10 +295,9 @@ mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
# otherwise we may get into trouble with distinct strings that the
# current locale considers to be equal.
ASSORT = LC_ALL=C sort
-programs = \
- echo 'spy:;@echo $$(all_programs)' \
- | MAKEFLAGS= $(MAKE) -s -C ../src -f Makefile -f - spy \
- | ../src/tr -s ' ' '\n' | $(ASSORT) -u | grep -v '\['
+all_programs = \
+ (cd ../src && MAKEFLAGS= $(MAKE) -s all_programs.list) \
+ | grep -v '\['
all: all-am
@@ -629,7 +628,7 @@ check-x-vs-1:
.PHONY: check-programs-vs-x
check-programs-vs-x:
status=0; \
- for p in dummy `$(programs)`; do \
+ for p in dummy `$(all_programs)`; do \
test $$p = dummy && continue; \
test $$p = ginstall && p=install || : ; \
test -f $(srcdir)/$$p.x \
diff --git a/src/Makefile.in b/src/Makefile.in
index f9bca9909..279958763 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -902,16 +902,16 @@ wheel_size = 5
# Tell automake to exempt then from that installcheck test.
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false test
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-all_programs = \
- $(bin_PROGRAMS) \
- $(bin_SCRIPTS) \
- $(EXTRA_PROGRAMS)
-
# Sort in traditional ASCII order, regardless of the current locale;
# otherwise we may get into trouble with distinct strings that the
# current locale considers to be equal.
ASSORT = LC_ALL=C sort
+all_programs = \
+ $(bin_PROGRAMS) \
+ $(bin_SCRIPTS) \
+ $(EXTRA_PROGRAMS)
+
pm = progs-makefile
pr = progs-readme
@@ -1674,6 +1674,9 @@ fs.h: stat.c extract-magic
$(PERL) $(srcdir)/extract-magic $(srcdir)/stat.c > $@t
@chmod a-w $@t
mv $@t $@
+
+all_programs.list:
+ @echo $(all_programs) | tr ' ' '\n' | $(ASSORT)
# Ensure that the list of programs in README matches the list
# of programs we can build.
check: check-README check-misc
diff --git a/tests/Makefile.in b/tests/Makefile.in
index f0bd2381c..59f6a7667 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -273,11 +273,7 @@ target_alias = @target_alias@
# otherwise we may get into trouble with distinct strings that the
# current locale considers to be equal.
ASSORT = LC_ALL=C sort
-all_programs = \
- echo 'spy:;@echo $$(all_programs)' \
- | MAKEFLAGS= $(MAKE) -s -C ../src -f Makefile -f - spy \
- | ../src/tr -s ' ' '\n' | $(ASSORT) -u
-
+all_programs = (cd ../src && MAKEFLAGS= $(MAKE) -s all_programs.list)
TESTS = help-version
TESTS_ENVIRONMENT = \
all_programs="`$(all_programs)`" \
diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index 23fdc0b12..e192f9442 100644
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -261,6 +261,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = 1.1 gnits
TESTS = \
+ unread3 \
no-give-up \
dir-no-w \
fail-2eperm \