diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-22 11:07:22 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-22 11:18:21 +0200 |
| commit | 158b46f23ea71c9c96e1f298e69cdc9822bcfc46 (patch) | |
| tree | d3a9f0c1a244a60c264e1e1f88249b630431401e /t/maken3.sh | |
| parent | 094b83a641e3b5b4aedf8820cb2af9d1c32cb476 (diff) | |
| download | automake-158b46f23ea71c9c96e1f298e69cdc9822bcfc46.tar.gz | |
tags: unify recursion for tags targets with that of "usual" targets
This change has a side effect: now any failure of the 'tags', 'ctags',
'cscope' and 'cscopelist' targets in a subdirectory will cause the
recursive command issued from the top directory to fail. We believe
that this behavioural change is not only justified by the simplification
this patch entails, but actually offers better semantics: ignoring
failures by default is never a good idea, and with make, the user can
anyway order the completion of commands in the face of possible failures
with the '-k' option.
* NEWS: Update.
* automake.in (%required_targets): Add keys 'cscopelist-am', 'tags-am'
and 'ctags-am'.
(handle_tags): Greatly simplified, the major part of the handling of
recursion for the 'tags', 'ctags' and 'cscopelist' now moved out to ...
* lib/am/tags.am: ... this file, that has been adjusted and extended
accordingly.
* t/maken3.sh: Remove testing of the 'TAGS' target, that is now just
an alias to 'tags'. Without this change, this test would spuriously
fail.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/maken3.sh')
| -rwxr-xr-x | t/maken3.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/maken3.sh b/t/maken3.sh index 6d580eca8..5f5d87a1b 100755 --- a/t/maken3.sh +++ b/t/maken3.sh @@ -22,7 +22,7 @@ # special target, the output from make is sufficiently complete. # # This test exercises the GCS-mandated targets (except for dist) -# as well as tags, TAGS. +# as well as tags. # For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || exit 1 @@ -111,8 +111,6 @@ installcheck-local: @: > stamp-installcheck-sub tags: @: > stamp-tags-sub -TAGS: - @: > stamp-TAGS-sub mostlyclean-local: @: > stamp-mostlyclean-sub maintainer-clean-local: @@ -127,7 +125,7 @@ html: @: > sub2-$@-should-not-be-executed install-info install-html install-dvi install-pdf install-ps: @: > sub2-$@-should-not-be-executed -installcheck installdirs tags TAGS mostlyclean: +installcheck installdirs tags mostlyclean: @: > sub2-$@-should-not-be-executed ## These targets cannot be overridden like this: ## install-strip distclean maintainer-clean @@ -142,12 +140,12 @@ check_targets () all install install-strip uninstall clean distclean check \ info html dvi pdf ps \ install-info install-html install-dvi install-pdf install-ps \ - installcheck installdirs tags TAGS mostlyclean maintainer-clean + installcheck installdirs tags mostlyclean maintainer-clean do $MAKE -n $target >stdout || { cat stdout; exit 1; } cat stdout case $target in - install-* | installdirs | tags | TAGS ) ;; + install-* | installdirs | tags ) ;; *) if $have_dotmake; then grep "stamp-$target$" stdout || exit 1 |