[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-45
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-45-g97d770d |
|
Date: |
Wed, 02 Jan 2013 14:08:16 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=97d770d69c3522beab5aec18d135d84b3b5eb449
The branch, master has been updated
via 97d770d69c3522beab5aec18d135d84b3b5eb449 (commit)
via fe05207b40350b189727351c22871ae5075b186f (commit)
via 20b7e1b8362e36a46147487828b232453997f5a9 (commit)
via 17fb9bd14f9c5abd925b7a5250d6c1e363a982d9 (commit)
via 5fbe39b56f17cba2586e2852194fcb005107f46f (commit)
via 10ead727bf246b0aac5b277763152bcd26559e1e (commit)
via 1c48cbe0bbe270de3a899acfcf83bc7e6b671147 (commit)
via e1ed31451f1df01799544a4c6482ae68a1b07019 (commit)
via 856394136f1a9dd2e40d728ca429664612b46a38 (commit)
via 2af418d1f8b9750f5395cfe897af4f726ad4667d (commit)
via 0a52679a428889c52166c4f6e493cec64fa917a4 (commit)
from db64467427f6355ba283b0c886263aa7ee6aa296 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 97d770d69c3522beab5aec18d135d84b3b5eb449
Merge: db64467 fe05207
Author: Stefano Lattarini <address@hidden>
Date: Wed Jan 2 14:45:42 2013 +0100
Merge branch 'maint'
* maint:
tests: reorganize tests on backslash issues
style: add trailing ':' to some test cases
tests: tweak tests on obsolete EXTRA_DATA variable
tests: more significant names for some tests
cosmetics: remove few occurrences of trailing whitespace
docs: re-introduce mention of two-args AM_INIT_AUTOMAKE invocation
texi: warn against '.txi' and '.texinfo' input suffixes
cleanup: remove two lines of dead code in automake
texi: warn against suffix-less info files
build: respect silent rules in generation of "amhello" example tarball
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 22 ++++++--
NEWS | 21 +++++++
THANKS | 1 +
automake.in | 29 ++++++----
doc/automake.texi | 58 ++++++++++++++------
t/backsl.sh | 34 ------------
t/backsl2.sh | 30 ----------
....sh => backslash-before-trailing-whitespace.sh} | 0
t/{backsl3.sh => backslash-issues.sh} | 30 ++++++++--
t/{cxxcpp.sh => extra-data.sh} | 15 +++---
t/{extradep2.sh => extra-deps-lt.sh} | 3 +-
t/{extradep.sh => extra-deps.sh} | 2 +-
t/{extra6.sh => extra-dist-dirs-and-subdirs.sh} | 2 +
t/{extra7.sh => extra-dist-vpath-dir-merge.sh} | 2 +
t/{extra5.sh => extra-dist-vpath-dir.sh} | 2 +
t/{extra11.sh => extra-dist-wildcards-gnu.sh} | 0
t/{extra12.sh => extra-dist-wildcards-vpath.sh} | 2 +
t/{extra10.sh => extra-dist-wildcards.sh} | 0
t/{extra9.sh => extra-programs-and-libs.sh} | 2 +-
t/{extra8.sh => extra-programs-misc.sh} | 0
t/extra.sh | 3 +-
t/extra2.sh | 3 +-
t/extra3.sh | 28 ----------
t/extra4.sh | 29 ----------
t/lisp-subdir2.sh | 2 +-
t/list-of-tests.mk | 29 +++++------
t/mdate2.sh | 2 +-
t/primary-prefix-valid-couples.sh | 2 +-
t/txinfo-makeinfo-error-no-clobber.sh | 20 ++++----
t/txinfo-no-repeated-targets.sh | 6 +-
t/txinfo-other-suffixes.sh | 10 +++-
t/txinfo-setfilename-repeated.sh | 6 ++-
t/txinfo-vtexi2.sh | 2 +-
t/txinfo-without-info-suffix.sh | 6 ++-
34 files changed, 192 insertions(+), 211 deletions(-)
delete mode 100755 t/backsl.sh
delete mode 100755 t/backsl2.sh
rename t/{backsl4.sh => backslash-before-trailing-whitespace.sh} (100%)
rename t/{backsl3.sh => backslash-issues.sh} (63%)
mode change 100755 => 100644
copy t/{cxxcpp.sh => extra-data.sh} (73%)
mode change 100755 => 100644
rename t/{extradep2.sh => extra-deps-lt.sh} (94%)
rename t/{extradep.sh => extra-deps.sh} (96%)
rename t/{extra6.sh => extra-dist-dirs-and-subdirs.sh} (99%)
rename t/{extra7.sh => extra-dist-vpath-dir-merge.sh} (99%)
rename t/{extra5.sh => extra-dist-vpath-dir.sh} (99%)
rename t/{extra11.sh => extra-dist-wildcards-gnu.sh} (100%)
rename t/{extra12.sh => extra-dist-wildcards-vpath.sh} (99%)
rename t/{extra10.sh => extra-dist-wildcards.sh} (100%)
rename t/{extra9.sh => extra-programs-and-libs.sh} (99%)
rename t/{extra8.sh => extra-programs-misc.sh} (100%)
delete mode 100755 t/extra3.sh
delete mode 100755 t/extra4.sh
diff --git a/Makefile.am b/Makefile.am
index 7561280..389da43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -617,7 +617,7 @@ dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
# aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
# configure in 't/wrap'.
$(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
- $(AM_V_GEN): \
+ $(AM_V_GEN)tmp=amhello-output.tmp \
&& PATH="$(abs_top_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
&& export PATH \
&& $(am__cd) $(srcdir)/doc/amhello \
@@ -628,11 +628,21 @@ $(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources)
$(srcdir)/configure.ac
&& AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
&& AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \
&& AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \
- && $(am_AUTORECONF) -vfi \
- && ./configure \
- && $(MAKE) $(AM_MAKEFLAGS) distcheck \
- && $(MAKE) $(AM_MAKEFLAGS) distclean \
- && rm -rf $(amhello_configury) \
+ && ( \
+ { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
+ && $(am_AUTORECONF) -vfi \
+ && ./configure \
+ && $(MAKE) $(AM_MAKEFLAGS) distcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) distclean \
+ || { \
+ if $(AM_V_P); then :; else \
+ echo "$@: recipe failed." >&5; \
+ echo "See file '`pwd`/$$tmp' for details" >&5; \
+ fi; \
+ exit 1; \
+ } \
+ ) \
+ && rm -rf $(amhello_configury) $$tmp \
&& mv -f amhello-1.0.tar.gz ..
diff --git a/NEWS b/NEWS
index 9365de1..4fb7ab7 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,27 @@ New in 1.13.2:
should take precedence over the same-named automake-provided macro
(defined in '/usr/local/share/aclocal-1.14/vala.m4').
+* Obsolescent features:
+
+ - Use of suffix-less info files (that can be specified through the
+ '@setfilename' macro in Texinfo input files) is discouraged, and
+ its use will raise warnings in the 'obsolete' category.
+
+ - Use of Texinfo input files with '.txi' or '.texinfo' extensions
+ is discouraged, and its use will raise warnings in the 'obsolete'
+ category. You are advised to simply use the '.texi' extension
+ instead.
+
+* Documentation fixes:
+
+ - The long-deprecated but still supported two-arguments invocation form
+ of AM_INIT_AUTOMAKE is documented once again. This seems the sanest
+ thing to do, given that support for such an usage might need to remain
+ in place for a unspecified amount of time in order to cater for people
+ who want to define the version number for their package dynamically at
+ configure runtime (unfortunately, Autoconf does not yet support this
+ scenario, so we cannot delegate the work to it).
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.13.1:
diff --git a/THANKS b/THANKS
index 5fa307d..58745e7 100644
--- a/THANKS
+++ b/THANKS
@@ -91,6 +91,7 @@ Dennis Schridde address@hidden
Derek R. Price address@hidden
Diab Jerius address@hidden
Didier Cassirame address@hidden
+Diego Elio Pettenò address@hidden
Dieter Baron address@hidden
Dieter Jurzitza address@hidden
ÐилÑн ÐалаÑзов address@hidden
diff --git a/automake.in b/automake.in
index 0748101..68d14c9 100644
--- a/automake.in
+++ b/automake.in
@@ -2984,9 +2984,12 @@ sub scan_texinfo_file ($)
next if $outfile;
$outfile = $1;
- # TODO: In Automake 1.14 (or even 1.13.2), start warning against
- # TODO: suffixes != ".info", to ease transition to Automake-NG.
- if ($outfile =~ /\.([^.]+)$/ && $1 ne 'info')
+ if (index ($outfile, '.') < 0)
+ {
+ msg 'obsolete', "$filename:$.",
+ "use of suffix-less info files is discouraged"
+ }
+ elsif ($outfile !~ /\.info$/)
{
error ("$filename:$.",
"output '$outfile' has unrecognized extension");
@@ -3007,10 +3010,6 @@ sub scan_texinfo_file ($)
return;
}
- my $infobase = basename ($filename);
- # TODO: In Automake 1.14 (or even 1.13.2), start warning against
- # TODO: suffixes != ".texi", to ease transition to Automake-NG.
- $infobase =~ s/\.te?xi(nfo)?$//;
return ($outfile, $vfile);
}
@@ -3138,11 +3137,17 @@ sub handle_texinfo_helper ($)
($info_texinfos->value_as_list_recursive (inner_expand => 1))
{
my $infobase = $texi;
- # TODO: In Automake 1.14 (or even 1.13.2), start warning against
- # TODO: suffixes != ".texi", to ease transition to Automake-NG.
- $infobase =~ s/\.(txi|texinfo|texi)$//;
-
- if ($infobase eq $texi)
+ if ($infobase =~ s/\.texi$//)
+ {
+ 1; # Nothing more to do.
+ }
+ elsif ($infobase =~ s/\.(txi|texinfo)$//)
+ {
+ msg_var 'obsolete', $info_texinfos,
+ "suffix '.$1' for Texinfo files is discouraged;" .
+ " use '.texi' instead";
+ }
+ else
{
# FIXME: report line number.
err_am "texinfo file '$texi' has unrecognized extension";
diff --git a/doc/automake.texi b/doc/automake.texi
index 4e5062b..c5e7bc4 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3887,19 +3887,25 @@ Automake ships with several Autoconf macros that you
can use from your
Runs many macros required for proper operation of the generated Makefiles.
@vindex AUTOMAKE_OPTIONS
address@hidden is called with a single argument: a space-separated
-list of Automake options that should be applied to every @file{Makefile.am}
-in the tree. The effect is as if each option were listed in
address@hidden (@pxref{Options}).
-
address@hidden FIXME: Remove this "modernization advice" in Automake 1.14 (and
adjust
address@hidden FIXME: the error message in m4/init.m4:AM_INIT_AUTOMAKE
accordingly).
+Today, @code{AM_INIT_AUTOMAKE} is called with a single argument: a
+space-separated list of Automake options that should be applied to
+every @file{Makefile.am} in the tree. The effect is as if
+each option were listed in @code{AUTOMAKE_OPTIONS} (@pxref{Options}).
@acindex AC_INIT
-This macro could once (before Automake 1.13) also be called in the
address@hidden obsolete and completely unsupported} form
+This macro can also be called in another, @emph{deprecated} form:
@code{AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])}. In this form,
-there were two required arguments: the package and the version number.
+there are two required arguments: the package and the version number.
+This usage is mostly obsolete because the @var{package} and @var{version}
+can be obtained from Autoconf's @code{AC_INIT} macro. However,
+differently from what happens for @code{AC_INIT} invocations, this
address@hidden invocation supports shell variables' expansions
+in the @code{PACKAGE} and @code{VERSION} arguments, and this can be
+still be useful in some selected situations. Our hope is that future
+Autoconf versions will improve their support for package versions
+defined dynamically at configure runtime; when (and if) this happens,
+support for the two-args @code{AM_INIT_AUTOMAKE} invocation will likely
+be removed from Automake.
@anchor{Modernize AM_INIT_AUTOMAKE invocation}
If your @file{configure.ac} has:
@@ -3910,8 +3916,7 @@ AM_INIT_AUTOMAKE([mumble], [1.5])
@end example
@noindent
-you must modernize it as follows in order to make it work with Automake
-1.13 or later:
+you should modernize it as follows:
@example
AC_INIT([mumble], [1.5])
@@ -8837,7 +8842,7 @@ If the standard output is connected to a capable
terminal, then the test
results and the summary are colored appropriately. The developer and the
user can disable colored output by setting the @command{make} variable
@samp{AM_COLOR_TESTS=no}; the user can in addition force colored output
-even without a connecting terminal with @samp{AM_COLOR_TESTS=always}.
+even without a connecting terminal with @samp{AM_COLOR_TESTS=always}.
It's also worth noting that some @command{make} implementations,
when used in parallel mode, have slightly different semantics
(@pxref{Parallel make,,, autoconf, The Autoconf Manual}), which can
@@ -9870,8 +9875,27 @@ be read as a side effect of running @command{configure},
like @file{version.sh}
in the example above.
Speaking of @file{version.sh} scripts, we recommend against them
-today. We recommend that @file{version.sh} be replaced by an M4 file
-that is included by @file{configure.ac}:
+today. They are mainly used when the version of a package is updated
+automatically by a script (e.g., in daily builds). Here is what some
+old-style @file{configure.ac}s may look like:
+
address@hidden
+AC_INIT
+. $srcdir/version.sh
+AM_INIT_AUTOMAKE([name], $VERSION_NUMBER)
address@hidden
address@hidden example
+
address@hidden
+Here, @file{version.sh} is a shell fragment that sets
address@hidden The problem with this example is that
address@hidden cannot track dependencies (listing @file{version.sh}
+in @command{CONFIG_STATUS_DEPENDENCIES}, and distributing this file is up
+to the user), and that it uses the obsolete form of @code{AC_INIT} and
address@hidden Upgrading to the new syntax is not
+straightforward, because shell variables are not allowed in
address@hidden's arguments. We recommend that @file{version.sh} be
+replaced by an M4 file that is included by @file{configure.ac}:
@example
m4_include([version.m4])
@@ -9885,7 +9909,9 @@ Here @file{version.m4} could contain something like
@samp{m4_define([VERSION_NUMBER], [1.2])}. The advantage of this
second form is that @command{automake} will take care of the
dependencies when defining the rebuild rule, and will also distribute
-the file automatically.
+the file automatically. An inconvenience is that @command{autoconf}
+will now be rerun each time the version number is bumped, when only
address@hidden had to be rerun in the previous setup.
@node Options
diff --git a/t/backsl.sh b/t/backsl.sh
deleted file mode 100755
index f316ac2..0000000
--- a/t/backsl.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test for "\" problems. Bug report from Joerg-Martin Schwarz.
-
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = \
- frob
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^_SOURCE' Makefile.in && exit 1
-exit 0
diff --git a/t/backsl2.sh b/t/backsl2.sh
deleted file mode 100755
index ae33894..0000000
--- a/t/backsl2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# We must skip the backslash, not complain about './\' not existing.
-# Reported by Rick Scott <address@hidden>
-
-. test-init.sh
-
-cat > Makefile.am << 'END'
-SUBDIRS = \
- .
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/t/backsl4.sh b/t/backslash-before-trailing-whitespace.sh
similarity index 100%
rename from t/backsl4.sh
rename to t/backslash-before-trailing-whitespace.sh
diff --git a/t/backsl3.sh b/t/backslash-issues.sh
old mode 100755
new mode 100644
similarity index 63%
rename from t/backsl3.sh
rename to t/backslash-issues.sh
index eed651e..9dae715
--- a/t/backsl3.sh
+++ b/t/backslash-issues.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,16 +14,34 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure we diagnose trailing backslash at the end of a file.
-# Report from Akim Demaile <address@hidden>.
+# Test for "\" problems.
+# TODO: might be nice to convert this to TAP...
. test-init.sh
+echo AC_PROG_CC >> configure.ac
+$ACLOCAL
+
+# Bug report from Joerg-Martin Schwarz.
cat > Makefile.am << 'END'
-foo = \
+bin_PROGRAMS = \
+ frob
END
+$AUTOMAKE
+grep '^_SOURCE' Makefile.in && exit 1
-$ACLOCAL
+# We must skip the backslash, not complain about './\' not existing.
+# Reported by Rick Scott <address@hidden>
+cat > Makefile.am << 'END'
+SUBDIRS = \
+ .
+END
+$AUTOMAKE
+
+# Make sure we diagnose trailing backslash at the end of a file.
+# Report from Akim Demaile <address@hidden>.
+echo 'foo = \' > Makefile.am
AUTOMAKE_fails
-cat stderr
grep 'trailing backslash' stderr
+
+:
diff --git a/t/cxxcpp.sh b/t/extra-data.sh
old mode 100755
new mode 100644
similarity index 73%
copy from t/cxxcpp.sh
copy to t/extra-data.sh
index 3c5e446..cded2a3
--- a/t/cxxcpp.sh
+++ b/t/extra-data.sh
@@ -14,19 +14,20 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure automake sees AC_PROG_CXXCPP. From Garth Corral.
+# Checks on the obsolete EXTRA_DATA variable.
. test-init.sh
-cat >> configure.ac << 'END'
-AC_PROG_CXXCPP
-END
-
-: > Makefile.am
+echo 'AC_SUBST([CODICIL])' >> configure.ac
$ACLOCAL
+
+# EXTRA_DATA is not required ....
+echo sysconf_DATA = @CODICIL@ > Makefile.am
$AUTOMAKE
-grep '^CXXCPP =' Makefile.in
+# ... but it can nonetheless be specified.
+echo EXTRA_DATA = codicil.txt >> Makefile.am
+$AUTOMAKE
:
diff --git a/t/extradep2.sh b/t/extra-deps-lt.sh
similarity index 94%
rename from t/extradep2.sh
rename to t/extra-deps-lt.sh
index 8472c34..8d4af44 100755
--- a/t/extradep2.sh
+++ b/t/extra-deps-lt.sh
@@ -14,7 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test EXTRA_*_DEPENDENCIES, libtool version; see 'extradep.sh'.
+# Test EXTRA_*_DEPENDENCIES, libtool version; see 'extra-deps.sh' for
+# non-libtool variant.
required='cc libtoolize'
. test-init.sh
diff --git a/t/extradep.sh b/t/extra-deps.sh
similarity index 96%
rename from t/extradep.sh
rename to t/extra-deps.sh
index 8b620a4..3bd6d1d 100755
--- a/t/extradep.sh
+++ b/t/extra-deps.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test EXTRA_*_DEPENDENCIES. See extradep2 for libtool variant.
+# Test EXTRA_*_DEPENDENCIES. See 'extra-deps-lt.sh' for libtool variant.
required=cc
. test-init.sh
diff --git a/t/extra6.sh b/t/extra-dist-dirs-and-subdirs.sh
similarity index 99%
rename from t/extra6.sh
rename to t/extra-dist-dirs-and-subdirs.sh
index 8f503fa..48798d1 100755
--- a/t/extra6.sh
+++ b/t/extra-dist-dirs-and-subdirs.sh
@@ -53,3 +53,5 @@ mkdir baz2
touch baz2/foo2
$MAKE check
+
+:
diff --git a/t/extra7.sh b/t/extra-dist-vpath-dir-merge.sh
similarity index 99%
rename from t/extra7.sh
rename to t/extra-dist-vpath-dir-merge.sh
index b54c03b..e897dcb 100755
--- a/t/extra7.sh
+++ b/t/extra-dist-vpath-dir-merge.sh
@@ -62,3 +62,5 @@ mkdir baz
echo build > baz/foo2
$MAKE check
+
+:
diff --git a/t/extra5.sh b/t/extra-dist-vpath-dir.sh
similarity index 99%
rename from t/extra5.sh
rename to t/extra-dist-vpath-dir.sh
index 704ab5b..b4d4e88 100755
--- a/t/extra5.sh
+++ b/t/extra-dist-vpath-dir.sh
@@ -36,3 +36,5 @@ mkdir build
cd build
../configure
$MAKE distdir
+
+:
diff --git a/t/extra11.sh b/t/extra-dist-wildcards-gnu.sh
similarity index 100%
rename from t/extra11.sh
rename to t/extra-dist-wildcards-gnu.sh
diff --git a/t/extra12.sh b/t/extra-dist-wildcards-vpath.sh
similarity index 99%
rename from t/extra12.sh
rename to t/extra-dist-wildcards-vpath.sh
index 93b35f7..9a500fe 100755
--- a/t/extra12.sh
+++ b/t/extra-dist-wildcards-vpath.sh
@@ -49,3 +49,5 @@ echo ddd > build/d.bar
cd build
../configure
$MAKE test
+
+:
diff --git a/t/extra10.sh b/t/extra-dist-wildcards.sh
similarity index 100%
rename from t/extra10.sh
rename to t/extra-dist-wildcards.sh
diff --git a/t/extra9.sh b/t/extra-programs-and-libs.sh
similarity index 99%
rename from t/extra9.sh
rename to t/extra-programs-and-libs.sh
index 120fb63..53dede0 100755
--- a/t/extra9.sh
+++ b/t/extra-programs-and-libs.sh
@@ -40,4 +40,4 @@ AUTOMAKE_fails
grep 'bin_PROGRAMS.*contains configure substitution' stderr
grep 'lib_LIBRARIES.*contains configure substitution' stderr && exit 1
-exit 0
+:
diff --git a/t/extra8.sh b/t/extra-programs-misc.sh
similarity index 100%
rename from t/extra8.sh
rename to t/extra-programs-misc.sh
diff --git a/t/extra.sh b/t/extra.sh
index c3d4c99..f041011 100755
--- a/t/extra.sh
+++ b/t/extra.sh
@@ -37,4 +37,5 @@ grep "^zardoz" Makefile.in
# Can't have EXTRA clean rules.
grep 'clean.*EXTRA' Makefile.in && exit 1
-exit 0
+
+:
diff --git a/t/extra2.sh b/t/extra2.sh
index d162442..b971a4b 100755
--- a/t/extra2.sh
+++ b/t/extra2.sh
@@ -30,4 +30,5 @@ $ACLOCAL
$AUTOMAKE
grep EXTRA_foo_SOURCES Makefile.in && exit 1
-exit 0
+
+:
diff --git a/t/extra3.sh b/t/extra3.sh
deleted file mode 100755
index 4fc4d3f..0000000
--- a/t/extra3.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_DATA not required.
-
-. test-init.sh
-
-echo 'AC_SUBST(CODICIL)' >> configure.ac
-
-cat > Makefile.am << 'END'
-sysconf_DATA = @CODICIL@
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/t/extra4.sh b/t/extra4.sh
deleted file mode 100755
index 2d21b4f..0000000
--- a/t/extra4.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_DATA can be specified.
-
-. test-init.sh
-
-echo 'AC_SUBST(CODICIL)' >> configure.ac
-
-cat > Makefile.am << 'END'
-sysconf_DATA = @CODICIL@
-EXTRA_DATA = codicil.txt
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/t/lisp-subdir2.sh b/t/lisp-subdir2.sh
index 8dc1f06..0eb3af1 100755
--- a/t/lisp-subdir2.sh
+++ b/t/lisp-subdir2.sh
@@ -63,7 +63,7 @@ test -f sub/am-two.el
test -f x/y/z/am-three.el
# Byte-compiling only a subset of the elisp files.
-$MAKE am-one.elc sub/am-two.elc
+$MAKE am-one.elc sub/am-two.elc
test -f am-one.elc
test -f sub/am-two.elc
test ! -e x/y/z/am-three.elc
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 883640a..6b60822 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -186,10 +186,8 @@ t/backcompat2.sh \
t/backcompat3.sh \
t/backcompat6.sh \
t/backcompat-acout.sh \
-t/backsl.sh \
-t/backsl2.sh \
-t/backsl3.sh \
-t/backsl4.sh \
+t/backslash-issues.sh \
+t/backslash-before-trailing-whitespace.sh \
t/badline.sh \
t/badopt.sh \
t/badprog.sh \
@@ -441,22 +439,21 @@ t/ext2.sh \
t/ext3.sh \
t/extra.sh \
t/extra2.sh \
-t/extra3.sh \
-t/extra4.sh \
-t/extra5.sh \
-t/extra6.sh \
-t/extra7.sh \
-t/extra8.sh \
-t/extra9.sh \
-t/extra10.sh \
-t/extra11.sh \
-t/extra12.sh \
+t/extra-data.sh \
+t/extra-dist-vpath-dir.sh \
+t/extra-dist-dirs-and-subdirs.sh \
+t/extra-dist-vpath-dir-merge.sh \
+t/extra-dist-wildcards.sh \
+t/extra-dist-wildcards-gnu.sh \
+t/extra-dist-wildcards-vpath.sh \
+t/extra-programs-misc.sh \
+t/extra-programs-and-libs.sh \
t/extra-programs-empty.sh \
t/extra-portability.sh \
t/extra-portability2.sh \
t/extra-portability3.sh \
-t/extradep.sh \
-t/extradep2.sh \
+t/extra-deps.sh \
+t/extra-deps-lt.sh \
t/f90only.sh \
t/flavor.sh \
t/flibs.sh \
diff --git a/t/mdate2.sh b/t/mdate2.sh
index 79e414b..fa41864 100755
--- a/t/mdate2.sh
+++ b/t/mdate2.sh
@@ -29,7 +29,7 @@ END
# Required when using Texinfo.
: > texinfo.tex
: > mdate-sh
-echo '@setfilename textutils' > textutils.texi
+echo '@setfilename textutils.info' > textutils.texi
# Use "././" to confuse Automake into thinking this is a subdir build.
$ACLOCAL
diff --git a/t/primary-prefix-valid-couples.sh
b/t/primary-prefix-valid-couples.sh
index 502967f..17a2a9b 100755
--- a/t/primary-prefix-valid-couples.sh
+++ b/t/primary-prefix-valid-couples.sh
@@ -38,7 +38,7 @@ AC_DEFUN([AC_PROG_LIBTOOL],
END
# Other required files.
-echo '@setfilename foo' > foo.texi
+echo '@setfilename foo.info' > foo.texi
: > texinfo.tex
: > py-compile
: > ar-lib
diff --git a/t/txinfo-makeinfo-error-no-clobber.sh
b/t/txinfo-makeinfo-error-no-clobber.sh
index cddbc13..f4b7d01 100755
--- a/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
@@ -29,7 +29,7 @@ mkdir sub
cat > main.texi << 'END'
\input texinfo
address@hidden main
address@hidden main.info
@settitle main
@node Top
Hello walls.
@@ -46,15 +46,15 @@ $AUTOCONF
$MAKE
# Feign more info files.
-: > main-1
-: > sub/main-1
+: > main.info-1
+: > sub/main.info-1
# Break main.texi.
$sleep
cp main.texi main.old
cat > main.texi << 'END'
\input texinfo
address@hidden main
address@hidden main.info
@settitle main
@node Top
@unknown_macro{Hello walls.}
@@ -63,16 +63,16 @@ END
# makeinfo will bail out, but we should conserve the old info files.
$MAKE && exit 1
-test -f main
-test -f main-1
+test -f main.info
+test -f main.info-1
# Restore main.texi, and break sub/main.texi.
cp main.texi sub/main.texi
mv main.old main.texi
$MAKE && exit 1
-test -f main
-test ! -e main-1
-test -f sub/main
-test -f sub/main-1
+test -f main.info
+test ! -e main.info-1
+test -f sub/main.info
+test -f sub/main.info-1
:
diff --git a/t/txinfo-no-repeated-targets.sh b/t/txinfo-no-repeated-targets.sh
index c9b977a..99894f5 100755
--- a/t/txinfo-no-repeated-targets.sh
+++ b/t/txinfo-no-repeated-targets.sh
@@ -19,12 +19,12 @@
. test-init.sh
cat > Makefile.am << 'END'
-info_TEXINFOS = maude.texi liver.txi heart.texinfo
+info_TEXINFOS = maude.texi liver.texi heart.texi
END
echo '@setfilename maude.info' > maude.texi
-echo '@setfilename liver.info' > liver.txi
-echo '@setfilename heart.info' > heart.texinfo
+echo '@setfilename liver.info' > liver.texi
+echo '@setfilename heart.info' > heart.texi
: > texinfo.tex
$ACLOCAL
diff --git a/t/txinfo-other-suffixes.sh b/t/txinfo-other-suffixes.sh
index 11f3a04..cbb3afa 100755
--- a/t/txinfo-other-suffixes.sh
+++ b/t/txinfo-other-suffixes.sh
@@ -14,7 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure '.txi' extension works.
+# Test to make sure '.txi' and '.texinfo' extensions are deprecated,
+# but still work.
. test-init.sh
@@ -27,7 +28,12 @@ echo '@setfilename bar.info' > bar.texinfo
: > texinfo.tex
$ACLOCAL
-$AUTOMAKE
+AUTOMAKE_fails
+grep "^Makefile\.am:.*suffix '.txi'.*Texinfo file.*discouraged" stderr
+grep "^Makefile\.am:.*suffix '.texinfo'.*Texinfo file.*discouraged" stderr
+grep "^Makefile\.am:.* use '.texi' instead" stderr
+
+$AUTOMAKE -Wno-obsolete
grep '^\.txi\.info: *$' Makefile.in
grep '^\.texinfo\.info: *$' Makefile.in
diff --git a/t/txinfo-setfilename-repeated.sh b/t/txinfo-setfilename-repeated.sh
index 1731dff..d06b9b9 100755
--- a/t/txinfo-setfilename-repeated.sh
+++ b/t/txinfo-setfilename-repeated.sh
@@ -24,7 +24,7 @@ info_TEXINFOS = texinfo.texi
END
cat > texinfo.texi << 'END'
address@hidden texinfo
address@hidden texinfo.info
...
@verbatim
@setfilename example.info
@@ -36,4 +36,6 @@ $ACLOCAL
$AUTOMAKE --add-missing
grep 'example' Makefile.in && exit 1
-grep 'texinfo:' Makefile.in
+grep 'texinfo\.info:' Makefile.in
+
+:
diff --git a/t/txinfo-vtexi2.sh b/t/txinfo-vtexi2.sh
index 0d12cc3..72bad5d 100755
--- a/t/txinfo-vtexi2.sh
+++ b/t/txinfo-vtexi2.sh
@@ -26,7 +26,7 @@ info_TEXINFOS = zardoz.texi
END
cat > zardoz.texi << 'END'
address@hidden zardoz
address@hidden zardoz.info
@include version.texi
END
diff --git a/t/txinfo-without-info-suffix.sh b/t/txinfo-without-info-suffix.sh
index b87ceb8..29bfbc9 100755
--- a/t/txinfo-without-info-suffix.sh
+++ b/t/txinfo-without-info-suffix.sh
@@ -29,6 +29,7 @@ END
cat > textutils.texi <<EOF
\input texinfo
address@hidden dummy comment
@setfilename textutils
@settitle main
@node Top
@@ -38,7 +39,10 @@ EOF
$ACLOCAL
$AUTOCONF
-$AUTOMAKE --add-missing
+AUTOMAKE_fails -a
+$EGREP '^(\./)?textutils\.texi:3:.*suffix-less info file' stderr
+
+$AUTOMAKE -a -Wno-obsolete
grep '^INFO_DEPS.*textutils$' Makefile.in
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-45-g97d770d,
Stefano Lattarini <=