[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13.1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13.1-772-gb8114a0 |
|
Date: |
Wed, 02 Jan 2013 14:44:56 +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=b8114a01dcb024711cf33d922f67a7b3a6cb642e
The branch, ng/master has been updated
via b8114a01dcb024711cf33d922f67a7b3a6cb642e (commit)
via 8416621a0721d6c0289768cc9d9bd8c83471f5a4 (commit)
via 1a23ae3037d49075d06df2a17d17d00e12c9f788 (commit)
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)
via db64467427f6355ba283b0c886263aa7ee6aa296 (commit)
via 2af1069b3b49c9fb72cf1a868fc76502096a99a5 (commit)
via 854be48f746b474273ec403870e13fe34949b79e (commit)
via 3200088b1ec074571f9d5c5243f524d63ac4c1c9 (commit)
from 829c01d5385ee4d3af121d3d85bf27cc009ab5c7 (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 b8114a01dcb024711cf33d922f67a7b3a6cb642e
Author: Stefano Lattarini <address@hidden>
Date: Wed Jan 2 15:43:13 2013 +0100
tests: avoid spurious failure due to "split" info files
This is a cleanup after the recent merge of 'master' into 'ng/master'.
* t/txinfo-makeinfo-error-no-clobber.sh: "Split" info files are no longer
supported since commit 'v1.12.2-901-gdd603e2', so don't expect them to
work.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 8416621a0721d6c0289768cc9d9bd8c83471f5a4
Author: Stefano Lattarini <address@hidden>
Date: Wed Jan 2 15:22:56 2013 +0100
tests: remove a broken check, not supposed to work with Automake-NG
* t/backslash-issues.sh: Here.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 1a23ae3037d49075d06df2a17d17d00e12c9f788
Merge: 829c01d 97d770d
Author: Stefano Lattarini <address@hidden>
Date: Wed Jan 2 15:19:55 2013 +0100
Merge branch 'master' into ng/master
* master:
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
NEWS: fixlets and updates
post-release: minor version bump (1.13.1a)
release: stable minor release 1.13.1
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 22 ++++++--
NEWS | 43 ++++++++++++---
THANKS | 1 +
automake.in | 9 +--
doc/automake-ng.texi | 58 ++++++++++++++------
t/backsl.sh | 34 ------------
....sh => backslash-before-trailing-whitespace.sh} | 0
t/{backsl2.sh => backslash-issues.sh} | 21 ++++++--
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/txinfo-makeinfo-error-no-clobber.sh | 1 +
25 files changed, 138 insertions(+), 146 deletions(-)
delete mode 100755 t/backsl.sh
rename t/{backsl4.sh => backslash-before-trailing-whitespace.sh} (100%)
rename t/{backsl2.sh => backslash-issues.sh} (73%)
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 9ba1006..13f4194 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -615,7 +615,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 \
&& cd $(srcdir)/doc/amhello \
@@ -626,11 +626,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) distcheck \
- && $(MAKE) distclean \
- && rm -rf $(amhello_configury) \
+ && ( \
+ { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
+ && $(am_AUTORECONF) -vfi \
+ && ./configure \
+ && $(MAKE) distcheck \
+ && $(MAKE) 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 cce3479..4fb7ab7 100644
--- a/NEWS
+++ b/NEWS
@@ -54,17 +54,17 @@ New in 1.14:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.13.1:
+New in 1.13.2:
* WARNING: Future backward-incompatibilities!
- - Automake 1.14 will likely require Autoconf 2.70 or later (which is
- still unreleased at the moment of writing, but is planned to be
- released before Automake 1.14 is).
+ - Automake 1.14 will require Autoconf 2.70 or later (which is still
+ unreleased at the moment of writing, but is planned to be released
+ before Automake 1.14 is).
- - Automake 1.14 will likely drop support for the long-deprecated
- 'configure.in' name for the Autoconf input file. You are advised
- to use the recommended name 'configure.ac' instead.
+ - Automake 1.14 will drop support for the long-deprecated 'configure.in'
+ name for the Autoconf input file. You are advised to start using
+ recommended name 'configure.ac' instead, ASAP.
- The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
be removed in Automake 1.14. The $(mkdir_p) make variable and the
@@ -75,8 +75,8 @@ New in 1.13.1:
- The ACLOCAL_AMFLAGS special make variable will be fully deprecated
in Automake 1.14 (where it will raise warnings in the "obsolete"
category). You are advised to start relying on the new Automake
- support for AC_CONFIG_MACRO_DIRS instead (which is introduced with
- this release; see below for more information).
+ support for AC_CONFIG_MACRO_DIRS instead (which was introduced in
+ Automake 1.13).
- Support for IRIX and the SGI C/C++ compilers will be removed in
Automake 1.14: they have seen their last release in 2006, and SGI
@@ -105,6 +105,31 @@ New in 1.13.1:
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:
+
* Bugs fixed:
- Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
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 d6f0bb9..2bb3e1f 100644
--- a/automake.in
+++ b/automake.in
@@ -2687,8 +2687,6 @@ sub scan_texinfo_file ($)
return;
}
- my $infobase = basename ($filename);
- $infobase =~ s/\.texi$//;
return ($outfile, $vfile);
}
@@ -2715,10 +2713,9 @@ sub handle_texinfo_helper ($)
($info_texinfos->value_as_list_recursive (inner_expand => 1))
{
my $infobase = $texi;
- $infobase =~ s/\.texi$//;
-
- if ($infobase eq $texi)
- {
+ # Strip tailing '.texi' suffix, complain if it's not there.
+ if ($infobase !~ s/\.texi$//)
+ {
# FIXME: report line number.
err_am "texinfo file '$texi' has unrecognized extension";
next;
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index cdb1565..a674573 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -3871,19 +3871,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:
@@ -3894,8 +3900,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])
@@ -8801,7 +8806,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
@@ -9829,8 +9834,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])
@@ -9844,7 +9868,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/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/backsl2.sh b/t/backslash-issues.sh
old mode 100755
new mode 100644
similarity index 73%
rename from t/backsl2.sh
rename to t/backslash-issues.sh
index ae33894..6b0a9a1
--- a/t/backsl2.sh
+++ b/t/backslash-issues.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-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,17 +14,28 @@
# 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 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'
+bin_PROGRAMS = \
+ frob
+END
+$AUTOMAKE
+grep '^_SOURCE' Makefile.in && exit 1
+
+# We must skip the backslash, not complain about './\' not existing.
+# Reported by Rick Scott <address@hidden>
cat > Makefile.am << 'END'
SUBDIRS = \
.
END
-
-$ACLOCAL
$AUTOMAKE
:
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 4086977..156e1d1 100755
--- a/t/extra12.sh
+++ b/t/extra-dist-wildcards-vpath.sh
@@ -47,3 +47,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/txinfo-makeinfo-error-no-clobber.sh
b/t/txinfo-makeinfo-error-no-clobber.sh
index c567e89..41f627f 100755
--- a/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
@@ -67,5 +67,6 @@ mv main.old main.texi
$MAKE && exit 1
test -f main.info
test -f sub/main.info
+test -f sub/main.info
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13.1-772-gb8114a0,
Stefano Lattarini <=