[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1781-g1595c2b |
|
Date: |
Wed, 25 Jan 2012 17:13:47 +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=1595c2b5a4efff02929ba8610bdda492d2b931a7
The branch, ng/master has been updated
via 1595c2b5a4efff02929ba8610bdda492d2b931a7 (commit)
via b99f546396b3705fcf816b0858e3a5074eae4c67 (commit)
via 9a82dcd6c44fc348cfd9bb7cc1c1c3a38a807d9c (commit)
from db988007c591f975c65905abc306a5f200ca2356 (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 1595c2b5a4efff02929ba8610bdda492d2b931a7
Author: Stefano Lattarini <address@hidden>
Date: Sun Jan 22 15:20:23 2012 +0100
[ng] deptrack: GNU make always supports the 'include' directive
Now that we assume GNU make, there is no need to check whether
and how the target make program supports an "include" directive.
In particular, the AC_SUBST'd variables 'am__include' and
'am__quote', as well as the autoconf macro 'AM_MAKE_INCLUDE',
are redundant, and shouldn't be used anymore.
* m4/make.m4: Delete, it's not needed anymore. In particular,
this removes the definition of ...
(AM_MAKE_INCLUDE): ... this internal macro.
* m4/depend.m4 (_AM_DEPENDENCIES): Assume make can always include
files at runtime with the "include FILE" syntax. Don't require
the 'AM_MAKE_INCLUDE' macro anymore.
* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): We don't need to
extract the definition of 'am__include' and 'am__quote' from the
makefile anymore; simplify accordingly.
* m4/Makefile.am (dist_automake_ac_DATA): Remove it.
* doc/automake.texi (Private Macros): Remove mention of the
obsolete macro 'AM_MAKE_INCLUDE'.
* Makefile.am (sc_make_simple_include): New maintainer check.
(sc_tests_make_simple_include): Likewise.
(syntax_check_rules): Add them.
(sc_grep_for_bad_make_include): New helper variable used by the
two new checks.
* tests/make.test: Remove, it's obsolete.
* tests/subobj11b.test: Likewise.
* tests/list-of-tests.mk: Don't list the deleted tests.
* tests/exsource.test: Update.
* tests/depend.test: Likewise.
* tests/depend4.test: Likewise.
* tests/subobj11a.test: Likewise.
* tests/subobj11c.test: Likewise.
commit b99f546396b3705fcf816b0858e3a5074eae4c67
Author: Stefano Lattarini <address@hidden>
Date: Sun Jan 22 16:14:31 2012 +0100
[ng] silent: GNU make understands nested variable expansions
So there's no need to check at configure time whether nested
variable expansion is supported. That check that was introduced
in commit 'v1.11-598-g8493499' of 2011-12-25 ("silent-rules:
fallback for makes without nested vars) in response to automake
bugs #9928 and #10237.
This commit basically reverts patch 'v1.11-598-g8493499' and some
of its follow-ups.
* m4/silent.m4 (AM_SILENT_RULES): Don't check whether 'make'
supports nested variables; assume that unconditionally. Don't
AC_SUBST '@AM_V@' nor '@AM_DEFAULT_V@' anymore.
* automake.in (define_verbose_var): Simplify accordingly.
* doc/automake.texi: Update.
* tests/silent-nested-vars.test: Remove as obsolete.
* tests/list-of-tests.mk: Update.
commit 9a82dcd6c44fc348cfd9bb7cc1c1c3a38a807d9c
Author: Stefano Lattarini <address@hidden>
Date: Mon Jan 23 14:22:38 2012 +0100
[ng] vars: don't warn about non-POSIX names or GNU make function calls
This change has the collateral effect of making the warning
category 'portability-recursive' obsolete.
* doc/automake.texi: Adjust and update.
* lib/Automake/ChannelDefs.pm: Don't register the warning channel
'portability-recursive' anymore.
(switch_warning): Don't handle 'portability-recursive' category
anymore. Related simplifications.
* lib/Automake/Variable.pm ($_VARIABLE_CHARACTERS): Remove.
($_VARIABLE_PATTERN): Likewise.
($_VARIABLE_RECURSIVE_PATTERN): Likewise.
(check_variable_expansions): Likewise.
(define): Don't call it.
* automake.in (read_am_file): Likewise.
(handle_options): Don't try to set/unset warnings in the category
'portability-recursive'.
* tests/test-driver-custom-xfail-tests.test: Remove now redundant
use of '-Wno-portability-recursive' in AUTOMAKE_OPTIONS.
* tests/canon.test: Adjust grepping of automake stderr.
* tests/canon5.test: Likewise.
* tests/silent6.test: Remove checks dealing with enabling/disabling
of 'portability-recursive' warnings.
* tests/gmake-vars.test: New test.
* tests/vars3.test: Remove as obsolete.
* tests/silent-nowarn.test: Likewise.
* tests/dollarvar.test: Likewise.
* tests/dollarvar2.test: Likewise.
* tests/extra-portability3.test: Likewise.
* tests/doc-parsing-buglets-colneq-subst.test: Remove as redundant.
* tests/list-of-tests.mk: Update.
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 24 +++++
automake.in | 23 +----
doc/automake.texi | 35 +------
lib/Automake/ChannelDefs.pm | 34 ++-----
lib/Automake/Variable.pm | 45 +--------
m4/Makefile.am | 1 -
m4/depend.m4 | 7 +-
m4/depout.m4 | 16 +--
m4/make.m4 | 51 ---------
m4/silent.m4 | 34 +------
tests/canon.test | 5 +-
tests/canon5.test | 3 +-
tests/depend.test | 8 +-
tests/depend4.test | 5 +-
tests/doc-parsing-buglets-colneq-subst.test | 37 -------
tests/dollarvar.test | 63 -----------
tests/dollarvar2.test | 91 ----------------
tests/exsource.test | 8 +-
tests/extra-portability3.test | 60 -----------
tests/gmake-vars.test | 84 +++++++++++++++
tests/list-of-tests.mk | 10 +--
tests/make.test | 51 ---------
tests/silent-nested-vars.test | 149 ---------------------------
tests/silent-nowarn.test | 44 --------
tests/silent6.test | 36 -------
tests/subobj11a.test | 16 ++-
tests/subobj11b.test | 85 ---------------
tests/subobj11c.test | 6 +-
tests/test-driver-custom-xfail-tests.test | 2 -
tests/vars3.test | 72 -------------
30 files changed, 163 insertions(+), 942 deletions(-)
delete mode 100644 m4/make.m4
delete mode 100755 tests/doc-parsing-buglets-colneq-subst.test
delete mode 100755 tests/dollarvar.test
delete mode 100755 tests/dollarvar2.test
delete mode 100755 tests/extra-portability3.test
create mode 100755 tests/gmake-vars.test
delete mode 100755 tests/make.test
delete mode 100755 tests/silent-nested-vars.test
delete mode 100755 tests/silent-nowarn.test
delete mode 100755 tests/subobj11b.test
delete mode 100755 tests/vars3.test
diff --git a/Makefile.am b/Makefile.am
index c88b2da..bb40e37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -235,6 +235,8 @@ sc_tests_make_can_chain_suffix_rules \
sc_no_am_makeflags \
sc_tests_no_make_e \
sc_docs_no_make_e \
+sc_make_simple_include \
+sc_tests_make_simple_include \
sc_tests_obsolete_variables \
sc_tests_plain_make \
sc_tests_plain_autoconf \
@@ -501,6 +503,28 @@ sc_tests_make_can_chain_suffix_rules:
exit 1; \
fi
+## GNU make supports POSIX-style runtime include directives.
+sc_grep_for_bad_make_include = \
+ if grep -E 'AM_MAKE_INCLUDE|am__(include|quote)' $$files; then \
+ echo 'GNU make supports runtime "include" directive.' 1>&2; \
+ echo 'Neither am__{include,quote} nor AM_MAKE_INCLUDE' \
+ 'should be used anymore.' 1>&2; \
+ exit 1; \
+ fi
+sc_tests_make_simple_include: sc_ensure_testsuite_has_run
+ @files=tests/*.log; $(sc_grep_for_bad_make_include)
+sc_make_simple_include:
+ @files=" \
+ $(xtests) \
+ $(srcdir)/lib/am/*.am \
+ $(srcdir)/m4/*.m4 \
+ $(srcdir)/automake.in \
+ $(srcdir)/doc/*.texi \
+ aclocal.m4 \
+ configure \
+ "; \
+ $(sc_grep_for_bad_make_include)
+
## $(AM_MAKEFLAGS) is obsolete now that we assume GNU make, since it
## is smart enough to correctly pass the values of macros redefined on
## the command line to sub-make invocations.
diff --git a/automake.in b/automake.in
index 68518e5..2f85dc1 100644
--- a/automake.in
+++ b/automake.in
@@ -1140,12 +1140,8 @@ sub define_verbose_var ($$)
my $silent_var = $pvar . '_0';
if (option 'silent-rules')
{
- # For typical `make's, `configure' replaces AM_V (inside @@) with $(V)
- # and AM_DEFAULT_V (inside @@) with $(AM_DEFAULT_VERBOSITY).
- # For strict POSIX 2008 `make's, it replaces them with 0 or 1 instead.
- # See AM_SILENT_RULES in m4/silent.m4.
- define_variable ($var, '$(' . $pvar . '_@'.'AM_V'.'@)', INTERNAL);
- define_variable ($pvar . '_', '$(' . $pvar . '_@'.'AM_DEFAULT_V'.'@)',
INTERNAL);
+ define_variable ($var, '$(' . $pvar . '_$(V))', INTERNAL);
+ define_variable ($pvar . '_', '$(' . $pvar .
'_$(AM_DEFAULT_VERBOSITY))', INTERNAL);
Automake::Variable::define ($silent_var, VAR_AUTOMAKE, '', TRUE, $val,
'', INTERNAL, VAR_ASIS)
if (! vardef ($silent_var, TRUE));
@@ -1238,10 +1234,6 @@ sub handle_options
return 1 if process_option_list (@options);
}
- # Override portability-recursive warning.
- switch_warning ('no-portability-recursive')
- if option 'silent-rules';
-
if ($strictness == GNITS)
{
set_option ('readme-alpha', INTERNAL);
@@ -1323,13 +1315,7 @@ sub handle_languages
$output_rules .= "\n";
foreach my $iter (@deplist)
{
- $output_rules .= (subst ('AMDEP_TRUE')
- . subst ('am__include')
- . ' '
- . subst ('am__quote')
- . $iter
- . subst ('am__quote')
- . "\n");
+ $output_rules .= subst ('AMDEP_TRUE') . "include $iter\n";
}
# Compute the set of directories to remove in distclean-depend.
@@ -6709,8 +6695,6 @@ sub read_am_file ($$)
# Automake::Rule::define). So we go on and ignore the return value.
Automake::Rule::define ($1, $amfile, RULE_USER, $cond, $where);
- check_variable_expansions ($_, $where);
-
$output_trailer .= $comment . $spacing;
my $cond = new Automake::Condition @cond_stack;
$output_trailer .= $cond->subst_string;
@@ -6794,7 +6778,6 @@ sub read_am_file ($$)
# This isn't an error; it is probably a continued rule.
# In fact, this is what we assume.
$prev_state = IN_RULE_DEF;
- check_variable_expansions ($_, $where);
$output_trailer .= $comment . $spacing;
my $cond = new Automake::Condition @cond_stack;
$output_trailer .= $cond->subst_string;
diff --git a/doc/automake.texi b/doc/automake.texi
index 227a4eb..a73798f 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1854,16 +1854,6 @@ Makefile constructs, so you're advised to avoid fancy
constructs or
For example, @key{TAB} characters cannot be used between a target name
and the following address@hidden:}'' character, and variable assignments
shouldn't be indented with @key{TAB} characters.
address@hidden Keep this in sync with doc-parsing-buglets-colneq-subst.test.
-Also, using more complex macro in target names can cause trouble:
-
address@hidden
-% @kbd{cat Makefile.am}
-$(FOO:=x): bar
-% @kbd{automake}
-Makefile.am:1: bad characters in variable name `$(FOO'
-Makefile.am:1: `:='-style assignments are not portable
address@hidden example
@cindex Make targets, overriding
@cindex Make rules, overriding
@@ -2734,8 +2724,6 @@ variables.
The categories output by default are @samp{syntax} and
@samp{unsupported}. Additionally, @samp{gnu} and @samp{portability}
are enabled in @option{--gnu} and @option{--gnits} strictness.
-On the other hand, the @option{silent-rules} options (@pxref{Options})
-turns off portability warnings about recursive variable expansions.
@c Checked by extra-portability.test
Turning off @samp{portability} will also turn off @samp{extra-portability},
@@ -4189,11 +4177,6 @@ These macros are used to implement Automake's automatic
dependency
tracking scheme. They are called automatically by Automake when
required, and there should be no need to invoke them manually.
address@hidden AM_MAKE_INCLUDE
-This macro is used to discover how the user's @command{make} handles
address@hidden statements. This macro is automatically invoked when
-needed; there should be no need to invoke it manually.
-
@item AM_PROG_INSTALL_STRIP
This is used to find a version of @code{install} that can be used to
strip a program at installation time. This macro is automatically
@@ -10922,23 +10905,9 @@ For portability to different @command{make}
implementations, package authors
are advised to not set the variable @code{V} inside the @file{Makefile.am}
file, to allow the user to override the value for subdirectories as well.
-The current implementation of this feature normally uses nested
-variable expansion @samp{$(@var{var1}$(V))}, a @file{Makefile} feature
-that is not required by POSIX 2008 but is widely supported in
-practice. The @option{silent-rules} option thus turns off warnings
-about recursive variable expansion, which are in turn enabled by
address@hidden (@pxref{automake Invocation}). On the rare
address@hidden implementations that do not support nested variable
-expansion, whether rules are silent is always determined at configure
-time, and cannot be overridden at make time. Future versions of POSIX
-are likely to require nested variable expansion, so this minor
-limitation should go away with time.
-
@vindex @code{AM_V_GEN}
@vindex @code{AM_V_at}
@vindex @code{AM_DEFAULT_VERBOSITY}
address@hidden @code{AM_V}
address@hidden @code{AM_DEFAULT_V}
To extend the silent mode to your own rules, you have two choices:
@itemize @bullet
@@ -10954,8 +10923,8 @@ The following snippet shows how you would define your
own equivalent of
@code{AM_V_GEN}:
@example
-pkg_verbose = $(pkg_verbose_@@AM_V@@)
-pkg_verbose_ = $(pkg_verbose_@@AM_DEFAULT_V@@)
+pkg_verbose = $(pkg_verbose_$(V))
+pkg_verbose_ = $(pkg_verbose_$(AM_DEFAULT_VERBOSITY))
pkg_verbose_0 = @@echo PKG-GEN $@@;
foo: foo.in
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 3e9fd1b..80fb2ac 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -160,7 +160,6 @@ register_channel 'gnu', type => 'warning';
register_channel 'obsolete', type => 'warning', silent => 1;
register_channel 'override', type => 'warning', silent => 1;
register_channel 'portability', type => 'warning', silent => 1;
-register_channel 'portability-recursive', type => 'warning', silent => 1;
register_channel 'syntax', type => 'warning';
register_channel 'unsupported', type => 'warning';
@@ -292,37 +291,18 @@ sub switch_warning ($)
elsif (channel_type ($cat) eq 'warning')
{
setup_channel $cat, silent => $has_no;
- #
- # Handling of portability warnings is trickier. For relevant tests,
- # see `dollarvar2', `extra-portability' and `extra-portability3'.
- #
- # -Wportability-recursive and -Wno-portability-recursive should not
- # have any effect on other 'portability' or 'extra-portability'
- # warnings, so there's no need to handle them separately or ad-hoc.
- #
+ # Handling of portability warnings is trickier.
+ # See 'extra-portability.test'.
if ($cat eq 'extra-portability' && ! $has_no) # -Wextra-portability
{
- # -Wextra-portability must enable 'portability' and
- # 'portability-recursive' warnings.
+ # '-Wextra-portability' must enable 'portability' warnings.
setup_channel 'portability', silent => 0;
- setup_channel 'portability-recursive', silent => 0;
}
- if ($cat eq 'portability') # -Wportability or -Wno-portability
+ if ($cat eq 'portability' && $has_no) # -Wno-portability
{
- if ($has_no) # -Wno-portability
- {
- # -Wno-portability must disable 'extra-portability' and
- # 'portability-recursive' warnings.
- setup_channel 'portability-recursive', silent => 1;
- setup_channel 'extra-portability', silent => 1;
- }
- else # -Wportability
- {
- # -Wportability must enable 'portability-recursive'
- # warnings. But it should have no influence over the
- # 'extra-portability' warnings.
- setup_channel 'portability-recursive', silent => 0;
- }
+ # '-Wno-portability' must disable 'extra-portability'
+ # warnings.
+ setup_channel 'extra-portability', silent => 1;
}
}
else
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index cd57877..6ce4a86 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -34,7 +34,7 @@ use vars '@ISA', '@EXPORT', '@EXPORT_OK';
@EXPORT = qw (err_var msg_var msg_cond_var reject_var
var rvar vardef rvardef
variables
- scan_variable_expansions check_variable_expansions
+ scan_variable_expansions
variable_delete
variables_dump
set_seen
@@ -753,44 +753,6 @@ sub scan_variable_expansions ($)
return @result;
}
-=item C<check_variable_expansions ($text, $where)>
-
-Check variable expansions in C<$text> and warn about any name that
-does not conform to POSIX. C<$where> is the location of C<$text>
-for the error message.
-
-=cut
-
-sub check_variable_expansions ($$)
-{
- my ($text, $where) = @_;
- # Catch expansion of variables whose name does not conform to POSIX.
- foreach my $var (scan_variable_expansions ($text))
- {
- if ($var !~ /$_VARIABLE_PATTERN/o)
- {
- # If the variable name contains a space, it's likely
- # to be a GNU make extension (such as $(addsuffix ...)).
- # Mention this in the diagnostic.
- my $gnuext = "";
- $gnuext = "\n(probably a GNU make extension)" if $var =~ / /;
- # Accept recursive variable expansions if so desired
- # (we hope they are rather portable in practice).
- if ($var =~ /$_VARIABLE_RECURSIVE_PATTERN/o)
- {
- msg ('portability-recursive', $where,
- "$var: non-POSIX recursive variable expansion$gnuext");
- }
- else
- {
- msg ('portability', $where, "$var: non-POSIX variable
name$gnuext");
- }
- }
- }
-}
-
-
-
=item C<Automake::Variable::define($varname, $owner, $type, $cond, $value,
$comment, $where, $pretty)>
Define or append to a new variable.
@@ -842,9 +804,6 @@ sub define ($$$$$$$$)
|| $pretty == VAR_SILENT
|| $pretty == VAR_SORTED);
- error $where, "bad characters in variable name `$var'"
- if $var !~ /$_VARIABLE_PATTERN/o;
-
# `:='-style assignments are not acknowledged by POSIX. Moreover it
# has multiple meanings. In GNU make or BSD make it means "assign
# with immediate expansion", while in OSF make it is used for
@@ -852,8 +811,6 @@ sub define ($$$$$$$$)
msg ('portability', $where, "`:='-style assignments are not portable")
if $type eq ':';
- check_variable_expansions ($value, $where);
-
# If there's a comment, make sure it is \n-terminated.
if ($comment)
{
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 95cb44d..3608511 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -37,7 +37,6 @@ lead-dot.m4 \
lex.m4 \
lispdir.m4 \
maintainer.m4 \
-make.m4 \
minuso.m4 \
missing.m4 \
mkdirp.m4 \
diff --git a/m4/depend.m4 b/m4/depend.m4
index cf1b3d8..be9c511 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,12 +1,12 @@
## -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# 2010, 2011, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 14
+# serial 15
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -28,7 +28,6 @@
AC_DEFUN([_AM_DEPENDENCIES],
[AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
@@ -89,7 +88,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# Solaris 8's {/usr,}/bin/sh.
touch sub/conftst$i.h
done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ echo "include sub/conftest.Po" > confmf
# We check with `-c' and `-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
diff --git a/m4/depout.m4 b/m4/depout.m4
index 3e046cd..81d8174 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -1,13 +1,13 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2012
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 5
+#serial 6
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
@@ -37,20 +37,16 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
else
continue
fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # Extract the definition of DEPDIR from the Makefile without
+ # running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ for file in `sed -n 's/^include \(.*(DEPDIR).*\)$/\1/p' <"$mf" \
+ | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
diff --git a/m4/make.m4 b/m4/make.m4
deleted file mode 100644
index 68d15b9..0000000
--- a/m4/make.m4
+++ /dev/null
@@ -1,51 +0,0 @@
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
diff --git a/m4/silent.m4 b/m4/silent.m4
index c94fff9..f8d0b5a 100644
--- a/m4/silent.m4
+++ b/m4/silent.m4
@@ -1,11 +1,11 @@
## -*- Autoconf -*-
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 1
# AM_SILENT_RULES([DEFAULT])
# --------------------------
@@ -25,36 +25,6 @@ case $enable_silent_rules in @%:@ (((
no) AM_DEFAULT_VERBOSITY=1;;
*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
-dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
- [am_cv_make_support_nested_variables],
- [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
- @$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
- dnl Using `$V' instead of `$(V)' breaks IRIX make.
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
AM_BACKSLASH='\'
AC_SUBST([AM_BACKSLASH])dnl
diff --git a/tests/canon.test b/tests/canon.test
index 51e03b2..9279d9f 100755
--- a/tests/canon.test
+++ b/tests/canon.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2010, 2011, 2012 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
@@ -30,7 +30,6 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'Makefile\.am:2:.* bad .*variable.*sniff-glue_SOURCES' stderr
grep 'Makefile\.am:2:.* use .*sniff_glue_SOURCES' stderr
:
diff --git a/tests/canon5.test b/tests/canon5.test
index 43c098b..ccd8930 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010, 2011 Free Software
+# Copyright (C) 1999, 2001, 2002, 2003, 2010, 2011, 2012 Free Software
# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -46,7 +46,6 @@ bin_PROGRAMS = ,foo
END
AUTOMAKE_fails
-grep 'Makefile\.am:2:.* bad .*variable.*,foo_SOURCES' stderr
grep 'Makefile\.am:2:.* use .*_foo_SOURCES' stderr
cat > Makefile.am << 'END'
diff --git a/tests/depend.test b/tests/depend.test
index 98b1307..5a5e950 100755
--- a/tests/depend.test
+++ b/tests/depend.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004, 2011, 2012 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
@@ -32,4 +32,6 @@ END
$ACLOCAL
$AUTOMAKE
-test 1 = `grep 'address@hidden@@am__include@' Makefile.in | wc -l`
+test 1 = `grep 'address@hidden@include ' Makefile.in | wc -l`
+
+:
diff --git a/tests/depend4.test b/tests/depend4.test
index 1dd782d..535faf7 100755
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2011, 2012 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
@@ -30,7 +31,7 @@ for header in one.h two.h three.h four.h five.h six.h; do
fred_SOURCES = fred1.c $headers
END
$AUTOMAKE
- test 1 = `grep 'address@hidden@@am__include@' Makefile.in | wc -l`
+ test 1 = `grep 'address@hidden@include ' Makefile.in | wc -l`
done
:
diff --git a/tests/doc-parsing-buglets-colneq-subst.test
b/tests/doc-parsing-buglets-colneq-subst.test
deleted file mode 100755
index f3a68d6..0000000
--- a/tests/doc-parsing-buglets-colneq-subst.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 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 a documented limitation of the Automake's Makefile parser
-# w.r.t. POSIX variable substitutions used in the name of targets.
-# See Section "General Operation" in the Automake manual.
-# If you cause some parts of this test to fail, chances are that you've
-# improved the Automake parser ;-)
-# See: <http://lists.gnu.org/archive/html/automake/2010-08/msg00074.html>
-# or:
<http://thread.gmane.org/gmane.comp.sysutils.automake.general/11943/focus=11962>
-
-. ./defs || Exit 1
-
-cat > Makefile.am <<'END'
-$(FOO:=x): bar
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-
-grep 'bad characters.*variable name.*\$(FOO' stderr
-grep ':=.*assignments.*not portable' stderr
-
-:
diff --git a/tests/dollarvar.test b/tests/dollarvar.test
deleted file mode 100755
index 9185990..0000000
--- a/tests/dollarvar.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2011 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 to make sure that -Wportability complains about recursive
-# variable expansions and variables containing `$', `$(...)', or
-# `${...}' in the name. We support recursive variable expansions using
-# the latter two constructs for the `silent-rules' option, and they are
-# rather widely supported in practice. OTOH variable definitions
-# containing a `$' on the left hand side of an assignment are not
-# portable in practice, even though POSIX allows them. :-/
-
-. ./defs || Exit 1
-
-cat >Makefile.am <<'EOF'
-x = 1
-foo$x = 1
-bar$(x) = 1
-baz${x} = 1
-bla = $(foo$x)
-bli = $(foo$(x))
-blo = $(foo${x})
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails -Wportability
-grep 'Makefile.am:2' stderr
-grep 'Makefile.am:3' stderr
-grep 'Makefile.am:4' stderr
-grep 'Makefile.am:5' stderr
-grep 'Makefile.am:6' stderr
-grep 'Makefile.am:7' stderr
-
-# On the other hand, if we allow `silent-rules' mode, then we need to
-# allow recursive variable expansion, too.
-
-# This should work with the AM_SILENT_RULES macro.
-$sleep
-echo 'AM_SILENT_RULES' >> configure.in
-
-$ACLOCAL --force
-AUTOMAKE_fails -Wportability
-grep 'Makefile.am:2' stderr
-grep 'Makefile.am:3' stderr
-grep 'Makefile.am:4' stderr
-grep 'Makefile.am:5' stderr
-grep 'Makefile.am:6' stderr && Exit 1
-grep 'Makefile.am:7' stderr && Exit 1
-
-
-:
diff --git a/tests/dollarvar2.test b/tests/dollarvar2.test
deleted file mode 100755
index cda9605..0000000
--- a/tests/dollarvar2.test
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2011 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 to make sure that -Wportability turns on portability-recursive,
-# likewise for -Wno-...
-
-. ./defs || Exit 1
-
-#
-# First, try a setup where we have a `portability-recursive' warning,
-# but no "simple" `portability' warning.
-#
-
-cat >Makefile.am <<'EOF'
-x = 1
-bla = $(foo$(x))
-EOF
-
-$ACLOCAL
-
-# Enabling `portability' warnings should enable `portability-recursive'
-# warnings.
-AUTOMAKE_fails -Wnone -Wportability
-grep 'recursive variable expansion' stderr
-# `portability-recursive' warnings can be enabled by themselves.
-AUTOMAKE_fails -Wnone -Wportability-recursive
-grep 'recursive variable expansion' stderr
-
-# Various ways to disable `portability-recursive'.
-$AUTOMAKE -Wno-all
-$AUTOMAKE -Wno-portability
-$AUTOMAKE -Wall -Wno-portability-recursive
-
-# `-Wno-portability-recursive' after `-Wportability' correctly disables
-# `portability-recursive' warnings.
-$AUTOMAKE -Wportability -Wno-portability-recursive
-
-# `-Wno-portability' disables `portability-recursive' warnings; but
-# a later `-Wportability-recursive' re-enables them. This time, we
-# use AUTOMAKE_OPTIONS to specify the warning levels.
-echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
-$AUTOMAKE
-echo 'AUTOMAKE_OPTIONS += -Wportability-recursive' >> Makefile.am
-AUTOMAKE_fails
-grep 'recursive variable expansion' stderr
-
-#
-# Now try a setup where we have both a `portability' warning and
-# a `portability-recursive' one.
-#
-
-cat >Makefile.am <<'EOF'
-x = 1
-bla = $(foo$(x))
-noinst_PROGRAMS = foo
-foo_CPPFLAGS = -Dwhatever
-EOF
-
-echo AC_PROG_CC >> configure.in
-
-$ACLOCAL --force
-
-# Can disable both `portability' and `portability-recursive' warnings.
-$AUTOMAKE -Wno-portability
-
-# Disabling `portability-recursive' warnings should not disable
-# `portability' warnings.
-AUTOMAKE_fails -Wportability -Wno-portability-recursive
-grep AM_PROG_CC_C_O stderr
-grep 'recursive variable expansion' stderr && Exit 1
-
-# Enabling `portability-recursive' warnings should not enable
-# all the `portability' warning.
-AUTOMAKE_fails -Wno-portability -Wportability-recursive
-grep AM_PROG_CC_C_O stderr && Exit 1
-grep 'recursive variable expansion' stderr
-
-:
diff --git a/tests/exsource.test b/tests/exsource.test
index daa5b01..194ce1f 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2011, 2012
+# 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
@@ -35,4 +35,6 @@ END
$ACLOCAL
$AUTOMAKE
-grep '@am__include@ .*/xtra\.P' Makefile.in
+grep 'address@hidden@include .*/xtra\.P' Makefile.in
+
+:
diff --git a/tests/extra-portability3.test b/tests/extra-portability3.test
deleted file mode 100755
index 125344d..0000000
--- a/tests/extra-portability3.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 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 interactions between the `portability-recursive' and
-# `extra-portability' warning categories.
-
-. ./defs || Exit 1
-
-# We want (almost) complete control over automake options.
-AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
-
-cat >>configure.in <<END
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-$ACLOCAL
-
-cat >Makefile.am <<'END'
-baz = $(foo$(bar))
-lib_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-# 'extra-portability' implies 'portability-recursive'.
-AUTOMAKE_fails -Wextra-portability
-grep 'requires.*AM_PROG_AR' stderr
-grep 'recursive variable expansion' stderr
-
-# We can disable 'extra-portability' while leaving
-# 'portability-recursive' intact.
-AUTOMAKE_fails -Wportability-recursive -Wno-extra-portability
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
-grep 'recursive variable expansion' stderr
-
-# We can disable 'portability-recursive' while leaving
-# 'extra-portability' intact.
-AUTOMAKE_fails -Wextra-portability -Wno-portability-recursive
-grep 'requires.*AM_PROG_AR' stderr
-grep 'recursive variable expansion' stderr && Exit 1
-
-# Disabling 'portability' disables 'portability-recursive' and
-# 'extra-portability'.
-$AUTOMAKE -Wextra-portability -Wno-portability
-
-:
diff --git a/tests/gmake-vars.test b/tests/gmake-vars.test
new file mode 100755
index 0000000..7c5ca00
--- /dev/null
+++ b/tests/gmake-vars.test
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2002, 2010, 2011 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 that Automake does not warns about nested variables expansion,
+# variables with non-POSIX names, or GNU make function calls.
+
+. ./defs || Exit 1
+
+cat > Makefile.am <<'END'
+define get-libname
+$(addprefix lib, $(1))
+endef
+
+v0 = $(shell LC_ALL=C && export LC_ALL && echo foo* bar*)
+v1 = $(sort $(wildcard foo* bar*))
+v2 = $(call get-libname, foo)
+v3 = sub/$(addsuffix .a, ${v2})
+v4 = $(v3)
+v4 += $(notdir ${v3})
+
+x = 1
+mu1 = okey-dokey
+bla = $(mu$x)
+bli = $(mu$(x))
+blo = $(mu${x})
+blu = $(mu1)
+
+bar$(x) = 6
+baz${x} = 7
+zap$x = 8
+
address@hidden;by,gnu/make = wow
+
+.PHONY: do/test my/prereq
+my/prereq:
+ @: Do nothing.
+do/test: my/prereq
+ : \
+ && test '$(v0)' = 'foo.sh bar.sh bar.txt' \
+ && test '$(v1)' = 'bar.sh bar.txt foo.sh' \
+ && test $(v3) = sub/libfoo.a \
+ && test '$(v4)' = 'sub/libfoo.a libfoo.a' \
+ && test $(bla) = okey-dokey \
+ && test $(bli) = okey-dokey \
+ && test $(blo) = okey-dokey \
+ && test $(blu) = okey-dokey \
+ && test $(bar1) = 6 \
+ && test $(baz1) = 7 \
+ && test $(zap1) = 8 \
+ && test $(address@hidden;by,gnu/make) = wow \
+## See automake bug#9587 .
+ && test '$(@F)' = 'test' \
+ && test '$(@D)' = 'do' \
+ && test '$(<F)' = 'prereq' \
+ && test '$(<D)' = 'my'
+END
+
+echo AC_OUTPUT >> configure.in
+
+$ACLOCAL
+$AUTOMAKE 2>stderr && test ! -s stderr || { cat stderr >&2; Exit 1; }
+
+: > foo.sh
+: > bar.sh
+: > bar.txt
+
+$AUTOCONF
+./configure
+make 'do/test'
+
+:
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 417e463..4ee2b36 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -375,11 +375,8 @@ distcheck-override-infodir.test \
distcheck-pr9579.test \
distcheck-pr10470.test \
dmalloc.test \
-doc-parsing-buglets-colneq-subst.test \
doc-parsing-buglets-tabs.test \
dollar.test \
-dollarvar.test \
-dollarvar2.test \
double.test \
dup2.test \
else.test \
@@ -413,7 +410,6 @@ extra12.test \
extra-programs-empty.test \
extra-portability.test \
extra-portability2.test \
-extra-portability3.test \
extradep.test \
extradep2.test \
f90only.test \
@@ -440,6 +436,7 @@ gcj6.test \
gettext.test \
gettext2.test \
gettext3.test \
+gmake-vars.test \
gnumake.test \
gnuwarn.test \
gnuwarn2.test \
@@ -605,7 +602,6 @@ m4-inclusion.test \
maintclean.test \
maintclean-vpath.test \
maintmode-configure-msg.test \
-make.test \
makefile-deps.test \
makej.test \
makej2.test \
@@ -919,9 +915,7 @@ silent-lex-gcc.test \
silent-lex-generic.test \
silent-yacc-gcc.test \
silent-yacc-generic.test \
-silent-nowarn.test \
silent-configsite.test \
-silent-nested-vars.test \
srcsub.test \
srcsub2.test \
space.test \
@@ -972,7 +966,6 @@ subobj8.test \
subobj9.test \
subobj10.test \
subobj11a.test \
-subobj11b.test \
subobj11c.test \
subobjname.test \
subpkg.test \
@@ -1148,7 +1141,6 @@ vala5.test \
vala-vpath.test \
vala-mix.test \
vars.test \
-vars3.test \
vartar.test \
vartypos.test \
vartypo2.test \
diff --git a/tests/make.test b/tests/make.test
deleted file mode 100755
index 651e805..0000000
--- a/tests/make.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 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 to make sure `make' check works.
-# From Ralf Corsepius.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AM_MAKE_INCLUDE
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-export ACLOCAL
-export AUTOCONF
-export AUTOMAKE
-
-# Do the test twice -- once with make and once with make -w.
-# This tests for a bug reported by Rainer Orth (see PR 175).
-
-save="$MAKE"
-for flag in '' -w; do
- MAKE="$save $flag" ./configure
- $FGREP 'am__include = include' Makefile
- $sleep
- touch configure.in
- $MAKE $flag
- $FGREP 'am__include = include' Makefile
- rm -f config.cache
-done
-
-Exit 0
diff --git a/tests/silent-nested-vars.test b/tests/silent-nested-vars.test
deleted file mode 100755
index 0024b5d..0000000
--- a/tests/silent-nested-vars.test
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011 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 silent-rules mode, on 'make' implementations that do not
-# support nested variables (Bug#9928, Bug#10237).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar
-bar_CFLAGS = $(AM_CFLAGS)
-
-# Check that AM_V and AM_DEFAULT_V work as advertised.
-pkg_verbose = $(address@hidden@)
-pkg_verbose_ = $(address@hidden@)
-pkg_verbose_0 = @echo PKG-GEN $@;
-
-bin_SCRIPTS = oop
-oop:
- $(pkg_verbose)echo $@ >$@
-
-mostlyclean-local:
- rm -f oop
-EOF
-
-cat > foo.c <<'EOF'
-int main ()
-{
- return 0;
-}
-EOF
-cp foo.c bar.c
-
-cat >mymake <<'EOF'
-#! /bin/sh
-makerules=
-
-case $1 in
- -f)
- makefile=$2
- case $2 in
- -) makerules=`cat` || exit ;;
- esac ;;
- *)
- for makefile in makefile Makefile; do
- test -f $makefile && break
- done ;;
-esac
-
-nested_var_pat='^[^#].*\$([^)]*\$'
-if
- case $makefile in
- -) printf '%s\n' "$makerules" | grep "$nested_var_pat";;
- *) grep "$nested_var_pat" $makefile;;
- esac
-then
- echo >&2 "mymake: $makefile contains nested variables"
- exit 1
-fi
-
-case $makefile in
- -) printf '%s\n' "$makerules" | $mymake_MAKE "$@";;
- *) exec $mymake_MAKE "$@";;
-esac
-EOF
-chmod a+x mymake
-mymake_MAKE=${MAKE-make}
-MAKE=./mymake
-export MAKE mymake_MAKE
-
-# As a sanity check, verify that `mymake' rejects Makefiles that
-# use nested variables.
-cat > Makefile <<'END'
-a = $(b$(c))
-all:
- touch bar
-END
-$MAKE && Exit 99
-mv -f Makefile foo.mk
-$MAKE -f foo.mk && Exit 99
-cat foo.mk | $MAKE -f - && Exit 99
-test -f bar && Exit 99
-sed '/a =/d' foo.mk > Makefile
-$MAKE && test -f bar || Exit 99
-rm -f bar Makefile foo.mk
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-silent-rules >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \
- stdout
-$EGREP 'CC|AM_V|GEN' Makefile # For debugging.
-grep '^AM_V_CC = *\$(am__v_CC_0) *$' Makefile
-grep '^AM_V_GEN = *\$(am__v_GEN_0) *$' Makefile
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep 'echo .*oop' stdout && Exit 1
-grep 'CC .*foo\.' stdout
-grep 'CC .*bar\.' stdout
-grep 'CCLD .*foo' stdout
-grep 'CCLD .*bar' stdout
-grep 'PKG-GEN .*oop' stdout
-$MAKE distclean
-
-./configure --disable-silent-rules > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \
- stdout
-$EGREP 'CC|AM_V|GEN' Makefile # For debugging.
-grep '^AM_V_CC = *\$(am__v_CC_1) *$' Makefile
-grep '^AM_V_GEN = *\$(am__v_GEN_1) *$' Makefile
-
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o foo' stdout
-grep ' -o bar' stdout
-grep 'echo .*>oop' stdout
-$EGREP '(CC|LD) ' stdout && Exit 1
-
-:
diff --git a/tests/silent-nowarn.test b/tests/silent-nowarn.test
deleted file mode 100755
index f0f5e70..0000000
--- a/tests/silent-nowarn.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011 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 that the 'silent-rules' mode suppresses the warnings for recursive
-# make variable expansions. This should happen regardless of whether and
-# where these warnings are requested.
-
-. ./defs || Exit 1
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-# Yes, we repeat the warnings two times, both before and after
-# 'silent-rules'. This is deliberate.
-AM_INIT_AUTOMAKE([gnu -Wall -Wportability-recursive
- silent-rules
- -Wall -Wportability-recursive])
-AC_CONFIG_FILES([Makefile])
-END
-
-cat > Makefile.am <<'END'
-AUTOMAKE_OPTIONS = gnu -Wall -Wportability-recursive
-foo = $($(v)) $(x$(v)) $($(v)x) $(y$(v)z)
-END
-
-# Files required bu gnu strictness.
-touch AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS
-
-$ACLOCAL
-$AUTOMAKE --gnu -Wall -Wportability-recursive
-
-:
diff --git a/tests/silent6.test b/tests/silent6.test
index b4759cb..640f666 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -68,40 +68,4 @@ cat stdout
grep '^ *GEN foo *$' stdout
grep 'cp ' stdout && Exit 1
-$MAKE distclean
-
-$sleep
-# Things should also work with -Wall in AM_INIT_AUTOMAKE.
-cat > configure.in <<'END'
-AC_INIT([silent6], [1.0])
-AM_INIT_AUTOMAKE([-Wall])
-AC_CONFIG_FILES([Makefile])
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-$AUTOMAKE -Wno-error
-
-# AM_SILENT_RULES should turn off the warning.
-$sleep
-echo 'AM_SILENT_RULES' >> configure.in
-$ACLOCAL
-$AUTOMAKE
-grep 'AM_V_GEN' Makefile.in
-$AUTOMAKE --force -Wno-all -Wportability
-grep 'AM_V_GEN' Makefile.in
-
-# The `silent-rules' option to AM_INIT_AUTOMAKE should work likewise.
-$sleep
-cat > configure.in <<'END'
-AC_INIT([silent6], [1.0])
-AM_INIT_AUTOMAKE([silent-rules])
-AC_CONFIG_FILES([Makefile])
-END
-$ACLOCAL
-$AUTOMAKE
-grep 'AM_V_GEN' Makefile.in
-$AUTOMAKE --force -Wno-all -Wportability
-grep 'AM_V_GEN' Makefile.in
-
:
diff --git a/tests/subobj11a.test b/tests/subobj11a.test
index 80406e3..6ec938e 100755
--- a/tests/subobj11a.test
+++ b/tests/subobj11a.test
@@ -14,14 +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/>.
-# Test that automake works around a bug of Solaris Make. The bug is the
-# following. If we have a Makefile containg a file inclusion like this:
+# If we have a Makefile containing a file inclusion like this:
+#
# include .//foo.mk
-# Solaris make fails with a message like:
+#
+# Solaris 10 make fails with a message like:
+#
# make: ... can't find `/foo.mk': No such file or directory
# make: fatal error ... read of include file `/foo.mk' failed
-# (even if the file `foo.mk' exists). The error disappear by collapsing
-# the repeated slash `/' characters into a single one.
+#
+# (even if the file `foo.mk' exists). The error disappear by
+# collapsing the repeated slash `/' characters into a single one.
+#
+# GNU make shouldn't suffer from this bug; but we check for it
+# anyway -- better safe than sorry.
#
# See also sister "grepping" test `subobj11b.test', and related test
# `subobj11c.test'.
diff --git a/tests/subobj11b.test b/tests/subobj11b.test
deleted file mode 100755
index 275b2ca..0000000
--- a/tests/subobj11b.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 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 that automake works around a bug of Solaris Make. The bug is the
-# following. If we have a Makefile containg a file inclusion like this:
-# include .//foo.mk
-# Solaris make fails with a message like:
-# make: ... can't find `/foo.mk': No such file or directory
-# make: fatal error ... read of include file `/foo.mk' failed
-# (even if the file `foo.mk' exists). The error disappear by collapsing
-# the repeated slash `/' characters into a single one.
-#
-# See also "semantic" sister test `subobj11a.test', and related test
-# `subobj11c.test'.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = foo
-## The `zardoz' sources should activate a code paths in Automake that
-## cannot be sensibly tested by sister test `subobj11a.test'. The other
-## sources provide some sort of stress testing.
-foo_SOURCES = \
- //server/zardoz0.c \
- //server//zardoz1.c \
- //server/path/to/zardoz2.c \
- //server/another//path///to////zardoz3.c \
- /foobar0.c \
- ///foobar1.c \
- ////foobar2.c \
- /sub///foobar3.c \
- ///sub/foobar4.c \
- .//foobar5.c \
- .//sub/foobar6.c \
- ./sub//foobar7.c \
- .//sub//foobar8.c \
- sub/sub//sub///sub////foobar9.c
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-# Be lax in the regexp, to account for automake conditionals, the
-# use of @am__include@, and similar stuff.
-grep 'include.*//.*foobar' Makefile.in && Exit 1
-
-# These checks depend on automake internals, but presently this is
-# the only way to test the code path we are interested in.
-# Please update these checks when (and if) the relevant automake
-# internals are changed.
-for x in zardoz0 zardoz1 path/to/zardoz2 another/path/to/zardoz3; do
- case $x in
- */*) d=`echo $x | sed 's,[^/]*$,,'`; b=`echo $x | sed 's,^.*/,,'`;;
- *) d=''; b=$x;;
- esac
- # Be a little lax in the regexp, to account for automake conditionals,
- # quoting, and similar stuff.
- grep "^[^/]*am__include[^/]*//server/$d\\\$(DEPDIR)/$b\\.[^/]*$" Makefile.in
-done
-
-# Sanity checks.
-for i in 0 1 2 3 4 5 6 7 8 9; do
- grep "am__include.*/foobar$i\\." Makefile.in
-done
-
-:
diff --git a/tests/subobj11c.test b/tests/subobj11c.test
index 6e8d270..d0f622b 100755
--- a/tests/subobj11c.test
+++ b/tests/subobj11c.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 2012 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
@@ -17,7 +17,7 @@
# Automatic dependency tracking with subdir-objects option active:
# check for a pathological case of slash-collapsing in the name of
# included makefile fragments (containing dependency info).
-# See also related tests `subobj11a.test' and `subobj11b.test'.
+# See also related test `subobj11a.test'.
. ./defs || Exit 1
@@ -46,6 +46,6 @@ $AUTOMAKE -a
#
# FIXME: Are we sure this is the most sensible output in our situation?
#
-grep '^[^/]*am__include[^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
+grep 'address@hidden@include [^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
:
diff --git a/tests/test-driver-custom-xfail-tests.test
b/tests/test-driver-custom-xfail-tests.test
index 3c46237..7758097 100755
--- a/tests/test-driver-custom-xfail-tests.test
+++ b/tests/test-driver-custom-xfail-tests.test
@@ -49,8 +49,6 @@ TESTS = pass.test x1.test x2.test x3.test x4.test x5.test
x6.test
END
cat > sub2/Makefile.am <<'END'
-AUTOMAKE_OPTIONS = -Wno-portability-recursive
-
TEST_LOG_DRIVER = $(srcdir)/../td
# XFAIL_TESTS should gracefully AC_SUBST @substitution@ and
diff --git a/tests/vars3.test b/tests/vars3.test
deleted file mode 100755
index 29dd575..0000000
--- a/tests/vars3.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 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 that Automake warns about variables containing spaces
-# and other non-POSIX characters.
-
-. ./defs || Exit 1
-
-cat >Makefile.am <<'EOF'
-L01 = $(shell echo *)
-L02 = $$(not an error)
-L03 = $$(this is)$${ok too}
-L04 = $(nextvariableisbad)$(addsuffix .a, $(A))
-L05 = "$(bad boy)"
-L06 = $(this:is= ok)
-L07 = ${three errors}${on this} $(long line)
-L08$(o u c h): $(wildcard *.c)
- ${another Error}
- echo $${ok-this is}
-L11: $(thisis) $(ok)
- ${here}
-EOF
-
-$ACLOCAL
-# Make sure this warning is print in the `portability' category.
-$AUTOMAKE --warnings=no-error,none,portability 2>stderr \
- || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-
-# Lines number are printed in error message.
-# Use them to make sure errors are diagnosed against the right lines.
-
-# No error expected apart from those on these lines.
-grep -v '^Makefile\.am:[145789]:' stderr | grep . && Exit 1
-
-# Now check some individual values.
-grep ':1:.*shell echo' stderr
-grep 'nextvariableisbad' stderr && Exit 1
-grep ':4:.*addsuffix' stderr
-grep ':5:.*bad boy' stderr
-grep ':7:.*three errors' stderr
-grep ':7:.*on this' stderr
-grep ':7:.*long line' stderr
-grep ':8:.*o u c h' stderr
-grep ':8:.*wildcard' stderr
-grep ':9:.*another Error' stderr
-
-$EGREP 'ok|thisis|here' stderr && Exit 1
-
-# None of these errors be diagnosed with `-Wno-portability'.
-$AUTOMAKE -Wno-portability
-
-# Likewise if we add this in the Makefile.am
-# (although this makes some difference internally: AUTOMAKE_OPTIONS is
-# processed far later).
-echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
-$AUTOMAKE
-
-:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1781-g1595c2b,
Stefano Lattarini <=