diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-03-31 14:53:24 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-30 18:05:30 +0200 |
| commit | 71cc0e0920d9dd864a3e4eae08ec91af177a8071 (patch) | |
| tree | 510132e6a7ad46dcfc2327bbedae2b6d6446f90c /t/flavor.sh | |
| parent | b4653256c2210d721e603023220e6fe05277286b (diff) | |
| download | automake-71cc0e0920d9dd864a3e4eae08ec91af177a8071.tar.gz | |
cygnus: warn when it's used (flagged as 'obsolete' now)
Support for "Cygnus-style" tree as enabled by the 'cygnus'
option is now reported as obsolete when the warnings in the
'obsolete' category are enabled.
See automake bug#11034.
* automake.in (check_cygnus): Report the use of 'cygnus' mode as
obsolete.
* NEWS: Update.
* docs/automake.texi: Minor adjustments.
* t/cygnus-deprecation.sh: New test.
* t/list-of-tests.mk: Add it.
* tests/cygnus-check-without-all.sh: Adjust by calling automake
with the warnings in the 'obsolete' category disabled.
* t/cygnus-requires-maintainer-mode.sh: Likewise.
* t/cygnus-dependency-tracking.sh: Likewise.
* t/cygnus-imply-foreign.sh: Likewise.
* t/cygnus-no-installinfo.sh: Likewise.
* t/cygnus-no-dist.sh: Likewise.
* t/clean2.sh: Likewise.
* t/flavor.sh: Likewise.
* t/txinfo5.sh: Likewise.
* t/txinfo5b.sh: Likewise.
* t/library.sh: Remove use of 'cygnus' and 'dejagnu' options,
and of AM_MAINTAINER_MODE macro.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/flavor.sh')
| -rwxr-xr-x | t/flavor.sh | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/t/flavor.sh b/t/flavor.sh index f53240690..6a1fddb3b 100755 --- a/t/flavor.sh +++ b/t/flavor.sh @@ -35,8 +35,8 @@ END $ACLOCAL $AUTOCONF # Order flavors so that all needed files are installed early. -for flavor in --gnits --gnu --foreign --cygnus --ignore-deps -do +for flavor in --gnits --gnu --foreign --ignore-deps; do + $AUTOMAKE --add-missing $flavor ./configure --enable-maintainer-mode grep " $flavor" Makefile @@ -54,6 +54,24 @@ do touch Makefile.am $MAKE grep " $flavor" Makefile + done +# Cygnus mode is deprecated now, and must be handled separately. +$AUTOMAKE --cygnus -Wno-obsolete +./configure --enable-maintainer-mode +grep " --cygnus" Makefile +$MAKE +# Two code paths in configure.am: +# - either a file in $(am__configure_deps) has been updated ... +$sleep +touch aclocal.m4 +$MAKE +grep " --cygnus" Makefile +# - ... or not; i.e., Makefile.am or an included file has. +$sleep +touch Makefile.am +$MAKE +grep " --cygnus" Makefile + : |