[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1b-1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1b-163-gd03bc76 |
|
Date: |
Fri, 19 Apr 2013 14:28:09 +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=d03bc76b473bf60e8c291893f780d98d5633d0a8
The branch, master has been updated
via d03bc76b473bf60e8c291893f780d98d5633d0a8 (commit)
via 00f911e702265c297a04ecbcd5957ef236bf6f2f (commit)
via a2ea514b1140d25dd2397ff48ff990a95b7f5e6b (commit)
via 389f32eb83bb1f9ecf0cbefc21539ea10b5a2ec5 (commit)
via ce98f22ef914ac5f778e63fc750e411b725ccb86 (commit)
via 82628de32451186708c0630cf995fdf5430c3f76 (commit)
via f4a283dc4fed2b1d9fff61c38017aa1a34cd162a (commit)
via 375cd196b718de69722c962e4ae944f91957562c (commit)
via 64b99c38a112083b4024a88d42c0fd9043b2c58e (commit)
via c8a2bc7c7331bed33cc47187d04fbc144b860dff (commit)
via 98a0b71f1161948b1b3f2e8b5694b9076a4e65eb (commit)
from 547c776a59b71ac8f45f3fb3e7fe6e41930b48e3 (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 d03bc76b473bf60e8c291893f780d98d5633d0a8
Merge: a2ea514 00f911e
Author: Stefano Lattarini <address@hidden>
Date: Fri Apr 19 16:13:41 2013 +0200
Merge branch 'maint'
* maint:
NEWS (mint): reflect new Automake versioning scheme
commit a2ea514b1140d25dd2397ff48ff990a95b7f5e6b
Author: Stefano Lattarini <address@hidden>
Date: Fri Apr 19 16:01:12 2013 +0200
NEWS (master): reflect new Automake versioning scheme
The next minor Automake version will be 1.14 (not 1.13.2 -- that will
be the next bug-fixing version). And the next major Automake version
will be 2.0.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 389f32eb83bb1f9ecf0cbefc21539ea10b5a2ec5
Merge: 547c776 ce98f22
Author: Stefano Lattarini <address@hidden>
Date: Fri Apr 19 15:46:54 2013 +0200
Merge branch 'maint'
* maint:
Add missing '$' for variable expansion in depout.m4
maintcheck: avoid spurious failure
perl: perl subroutine prototypes are problematic, don't use them
fixup: one stray reference to older versioning scheme
-----------------------------------------------------------------------
Summary of changes:
NEWS | 4 +-
THANKS | 1 +
automake.in | 224 ++++++++++++++++++++++++----------------------
lib/Automake/Options.pm | 2 +-
m4/depout.m4 | 2 +-
t/preproc-errmsg.sh | 11 ++-
6 files changed, 129 insertions(+), 115 deletions(-)
diff --git a/NEWS b/NEWS
index 495648f..6f16380 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.14:
+New in 2.0:
* Aclocal search path:
@@ -131,7 +131,7 @@ New in 1.14:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.13.2:
+New in 1.14:
* C compilation, and the AC_PROG_CC and AM_PROG_CC_C_O macros:
diff --git a/THANKS b/THANKS
index c8ec3fd..cf46972 100644
--- a/THANKS
+++ b/THANKS
@@ -128,6 +128,7 @@ Ganesan Rajagopal address@hidden
Garrett D'Amore address@hidden
Garth Corral address@hidden
Gary V Vaughan address@hidden
+Gavin Smith address@hidden
Geoffrey Keating address@hidden
Glenn Amerine address@hidden
Gord Matzigkeit address@hidden
diff --git a/automake.in b/automake.in
index 236c654..5d0d861 100644
--- a/automake.in
+++ b/automake.in
@@ -520,7 +520,7 @@ my %am_file_cache;
# macro_define() call because SUFFIXES definitions impact
# on $KNOWN_EXTENSIONS_PATTERN which is used used when parsing
# the input am file.
-sub var_SUFFIXES_trigger ($$)
+sub var_SUFFIXES_trigger
{
my ($type, $value) = @_;
accept_extensions (split (' ', $value));
@@ -937,23 +937,23 @@ register_language ('name' => 'java',
# err_am ($MESSAGE, [%OPTIONS])
# -----------------------------
# Uncategorized errors about the current Makefile.am.
-sub err_am ($;%)
+sub err_am
{
- msg_am ('error', shift, @_);
+ msg_am ('error', @_);
}
# err_ac ($MESSAGE, [%OPTIONS])
# -----------------------------
# Uncategorized errors about configure.ac.
-sub err_ac ($;%)
+sub err_ac
{
- msg_ac ('error', shift, @_);
+ msg_ac ('error', @_);
}
# msg_am ($CHANNEL, $MESSAGE, [%OPTIONS])
# ---------------------------------------
# Messages about about the current Makefile.am.
-sub msg_am ($$;%)
+sub msg_am
{
my ($channel, $msg, %opts) = @_;
msg $channel, "${am_file}.am", $msg, %opts;
@@ -962,7 +962,7 @@ sub msg_am ($$;%)
# msg_ac ($CHANNEL, $MESSAGE, [%OPTIONS])
# ---------------------------------------
# Messages about about configure.ac.
-sub msg_ac ($$;%)
+sub msg_ac
{
my ($channel, $msg, %opts) = @_;
msg $channel, $configure_ac, $msg, %opts;
@@ -976,7 +976,7 @@ sub msg_ac ($$;%)
# We do this to avoid having the substitutions directly in automake.in;
# when we do that they are sometimes removed and this causes confusion
# and bugs.
-sub subst ($)
+sub subst
{
my ($text) = @_;
return '@' . $text . '@';
@@ -991,7 +991,7 @@ sub subst ($)
# If I "cd $RELDIR", then to come back, I should "cd $BACKPATH".
# For instance 'src/foo' => '../..'.
# Works with non strictly increasing paths, i.e., 'src/../lib' => '..'.
-sub backname ($)
+sub backname
{
my ($file) = @_;
my @res;
@@ -1018,7 +1018,7 @@ sub backname ($)
# verbose_var (NAME)
# ------------------
# The public variable stem used to implement silent rules.
-sub verbose_var ($)
+sub verbose_var
{
my ($name) = @_;
return 'AM_V_' . $name;
@@ -1027,7 +1027,7 @@ sub verbose_var ($)
# verbose_private_var (NAME)
# --------------------------
# The naming policy for the private variables for silent rules.
-sub verbose_private_var ($)
+sub verbose_private_var
{
my ($name) = @_;
return 'am__v_' . $name;
@@ -1038,7 +1038,7 @@ sub verbose_private_var ($)
# For silent rules, setup VAR and dispatcher, to expand to
# VAL-IF-SILENT if silent, to VAL-IF-VERBOSE (defaulting to
# empty) if not.
-sub define_verbose_var ($$;$)
+sub define_verbose_var
{
my ($name, $silent_val, $verbose_val) = @_;
$verbose_val = '' unless defined $verbose_val;
@@ -1064,13 +1064,13 @@ sub define_verbose_var ($$;$)
# verbose_flag (NAME)
# -------------------
# Contents of '%VERBOSE%' variable to expand before rule command.
-sub verbose_flag ($)
+sub verbose_flag
{
my ($name) = @_;
return '$(' . verbose_var ($name) . ')';
}
-sub verbose_nodep_flag ($)
+sub verbose_nodep_flag
{
my ($name) = @_;
return '$(' . verbose_var ($name) . subst ('am__nodep') . ')';
@@ -1087,7 +1087,7 @@ sub silent_flag ()
# define_verbose_tagvar (NAME)
# ----------------------------
# Engage the needed silent rules machinery for tag NAME.
-sub define_verbose_tagvar ($)
+sub define_verbose_tagvar
{
my ($name) = @_;
define_verbose_var ($name, '@echo " '. $name . ' ' x (8 - length ($name))
. '" $@;');
@@ -1164,7 +1164,7 @@ sub handle_options ()
# If the VAR wasn't defined conditionally, return $(VAR).
# Otherwise we create an am__VAR_DIST variable which contains
# all possible values, and return $(am__VAR_DIST).
-sub shadow_unconditionally ($$)
+sub shadow_unconditionally
{
my ($varname, $where) = @_;
my $var = var $varname;
@@ -1181,7 +1181,7 @@ sub shadow_unconditionally ($$)
# ----------------------------
# Make sure each variable VAR in @LIST does not exist, suggest using AM_VAR
# otherwise.
-sub check_user_variables (@)
+sub check_user_variables
{
my @dont_override = @_;
foreach my $flag (@dont_override)
@@ -1511,7 +1511,7 @@ sub append_exeext (&$)
# mentioned. This is a separate function (as opposed to being inlined
# in handle_source_transform) because it isn't always appropriate to
# do this check.
-sub check_libobjs_sources ($$)
+sub check_libobjs_sources
{
my ($one_file, $unxformed) = @_;
@@ -1559,7 +1559,7 @@ sub check_libobjs_sources ($$)
# when producing explicit rules
# Result is a list of the names of objects
# %linkers_used will be updated with any linkers needed
-sub handle_single_transform ($$$$$%)
+sub handle_single_transform
{
my ($var, $topparent, $derived, $obj, $_file, %transform) = @_;
my @files = ($_file);
@@ -1962,7 +1962,7 @@ EOF
#
# Result is a pair ($LINKER, $OBJVAR):
# $LINKER is a boolean, true if a linker is needed to deal with the objects
-sub define_objects_from_sources ($$$$$$$%)
+sub define_objects_from_sources
{
my ($var, $objvar, $nodefine, $one_file,
$obj, $topparent, $where, %transform) = @_;
@@ -1996,7 +1996,7 @@ sub define_objects_from_sources ($$$$$$$%)
# extra arguments to pass to file_contents when producing rules
# Return the name of the linker variable that must be used.
# Empty return means just use 'LINK'.
-sub handle_source_transform ($$$$%)
+sub handle_source_transform
{
# one_file is canonical name. unxformed is given name. obj is
# object extension.
@@ -2034,7 +2034,7 @@ sub handle_source_transform ($$$$%)
$needlinker |=
define_objects_from_sources ($varname,
$xpfx . $one_file . '_OBJECTS',
- $prefix =~ /EXTRA_/,
+ !!($prefix =~ /EXTRA_/),
$one_file, $obj, $varname, $where,
DIST_SOURCE => ($prefix !~ /^nodist_/),
%transform);
@@ -2118,7 +2118,7 @@ sub handle_source_transform ($$$$%)
# transformed name of object being built, or empty string if no object
# name of _LDADD/_LIBADD-type variable to examine
# Returns 1 if LIBOBJS seen, 0 otherwise.
-sub handle_lib_objects ($$)
+sub handle_lib_objects
{
my ($xname, $varname) = @_;
@@ -2196,7 +2196,7 @@ sub handle_lib_objects ($$)
# -------------------------------
# Definitions common to LIBOBJS and ALLOCA.
# VAR should be one of LIBOBJS, LTLIBOBJS, ALLOCA, or LTALLOCA.
-sub handle_LIBOBJS_or_ALLOCA ($)
+sub handle_LIBOBJS_or_ALLOCA
{
my ($var) = @_;
@@ -2235,7 +2235,7 @@ sub handle_LIBOBJS_or_ALLOCA ($)
return $dir;
}
-sub handle_LIBOBJS ($$$)
+sub handle_LIBOBJS
{
my ($var, $cond, $lt) = @_;
my $myobjext = $lt ? 'lo' : 'o';
@@ -2274,7 +2274,7 @@ sub handle_LIBOBJS ($$$)
}
}
-sub handle_ALLOCA ($$$)
+sub handle_ALLOCA
{
my ($var, $cond, $lt) = @_;
my $myobjext = $lt ? 'lo' : 'o';
@@ -2288,7 +2288,7 @@ sub handle_ALLOCA ($$$)
}
# Canonicalize the input parameter.
-sub canonicalize ($)
+sub canonicalize
{
my ($string) = @_;
$string =~ tr/A-Za-z0-9_\@/_/c;
@@ -2298,7 +2298,7 @@ sub canonicalize ($)
# Canonicalize a name, and check to make sure the non-canonical name
# is never used. Returns canonical name. Arguments are name and a
# list of suffixes to check for.
-sub check_canonical_spelling ($@)
+sub check_canonical_spelling
{
my ($name, @suffixes) = @_;
@@ -2884,7 +2884,7 @@ sub handle_scripts ()
# -----------------------------
# $OUTFILE - name of the info file produced by $FILENAME.
# $VFILE - name of the version.texi file used (undef if none).
-sub scan_texinfo_file ($)
+sub scan_texinfo_file
{
my ($filename) = @_;
@@ -2939,7 +2939,7 @@ sub scan_texinfo_file ($)
# DEST - the destination Info file
# INSRC - whether DEST should be built in the source tree
# DEPENDENCIES - known dependencies
-sub output_texinfo_build_rules ($$$@)
+sub output_texinfo_build_rules
{
my ($source, $dest, $insrc, @deps) = @_;
@@ -3034,7 +3034,7 @@ sub output_texinfo_build_rules ($$$@)
# handle_texinfo_helper ($info_texinfos)
# --------------------------------------
# Handle all Texinfo source; helper for 'handle_texinfo'.
-sub handle_texinfo_helper ($)
+sub handle_texinfo_helper
{
my ($info_texinfos) = @_;
my (@infobase, @info_deps_list, @texi_deps);
@@ -3576,7 +3576,7 @@ sub handle_tags ()
# Return false if rule $NAME does not exist. Otherwise,
# declare it as phony, complete its definition (in case it is
# conditional), and return its Automake::Rule instance.
-sub user_phony_rule ($)
+sub user_phony_rule
{
my ($name) = @_;
my $rule = rule $name;
@@ -3736,7 +3736,7 @@ sub handle_dist ()
# -------------------------------------------------------
# Ensure $NAME is a directory (in $RELATIVE_DIR), and that it uses a sane
# name. Use $WHERE as a location in the diagnostic, if any.
-sub check_directory ($$;$)
+sub check_directory
{
my ($dir, $where, $reldir) = @_;
$reldir = '.' unless defined $reldir;
@@ -3774,7 +3774,7 @@ sub check_directory ($$;$)
# check_directories_in_var ($VARIABLE)
# ------------------------------------
# Recursively check all items in variables $VARIABLE as directories
-sub check_directories_in_var ($)
+sub check_directories_in_var
{
my ($var) = @_;
$var->traverse_recursively
@@ -3837,7 +3837,7 @@ sub scan_aclocal_m4 ()
# Helper function for 'substitute_ac_subst_variables'.
-sub substitute_ac_subst_variables_worker($)
+sub substitute_ac_subst_variables_worker
{
my ($token) = @_;
return "address@hidden@" if var $token;
@@ -3848,7 +3848,7 @@ sub substitute_ac_subst_variables_worker($)
# -------------------------------------
# Replace any occurrence of ${FOO} in $TEXT by @FOO@ if FOO is an AC_SUBST
# variable.
-sub substitute_ac_subst_variables ($)
+sub substitute_ac_subst_variables
{
my ($text) = @_;
$text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
@@ -3863,7 +3863,7 @@ sub substitute_ac_subst_variables ($)
# directory, then the directory part is simply replaced by $(srcdir).
# But if the directory part is different, then $(top_srcdir) is
# prepended.
-sub prepend_srcdir (@)
+sub prepend_srcdir
{
my (@inputs) = @_;
my @newinputs;
@@ -3889,7 +3889,7 @@ sub prepend_srcdir (@)
# rule of
# AC_CONFIG_FILES($OUTPUT:$INPUT[0]:$INPUTS[1]:...)
# Also distribute $INPUTs which are not built by another AC_CONFIG_FOOs.
-sub rewrite_inputs_into_dependencies ($@)
+sub rewrite_inputs_into_dependencies
{
my ($file, @inputs) = @_;
my @res = ();
@@ -3934,7 +3934,7 @@ sub rewrite_inputs_into_dependencies ($@)
# -----------------------------------------------------------------
# Handle remaking and configure stuff.
# We need the name of the input file, to do proper remaking rules.
-sub handle_configure ($$$@)
+sub handle_configure
{
my ($makefile_am, $makefile_in, $makefile, @inputs) = @_;
@@ -4356,14 +4356,16 @@ sub handle_install ()
? (" \$(BUILT_SOURCES)\n"
. "\t\$(MAKE) \$(AM_MAKEFLAGS)")
: ''),
- 'installdirs-local' => (user_phony_rule 'installdirs-local'
+ 'installdirs-local' => (user_phony_rule ('installdirs-local')
? ' installdirs-local' : ''),
am__installdirs => variable_value ('am__installdirs') || '');
}
+# handle_all ($MAKEFILE)
+#-----------------------
# Deal with 'all' and 'all-am'.
-sub handle_all ($)
+sub handle_all
{
my ($makefile) = @_;
@@ -4487,7 +4489,7 @@ sub do_check_merge_target ()
}
# Handle all 'clean' targets.
-sub handle_clean ($)
+sub handle_clean
{
my ($makefile) = @_;
@@ -4647,7 +4649,9 @@ sub handle_tests_dejagnu ()
$output_rules .= file_contents ('dejagnu', new Automake::Location);
}
-sub handle_per_suffix_test ($%)
+# handle_per_suffix_test ($TEST_SUFFIX, [%TRANSFORM])
+#----------------------------------------------------
+sub handle_per_suffix_test
{
my ($test_suffix, %transform) = @_;
my ($pfx, $generic, $am_exeext);
@@ -4700,7 +4704,7 @@ sub handle_per_suffix_test ($%)
# ------------------------------
# Return true if $EXT can appear in $(TEST_EXTENSIONS), return false
# otherwise.
-sub is_valid_test_extension ($)
+sub is_valid_test_extension
{
my $ext = shift;
return 1
@@ -4948,7 +4952,7 @@ sub handle_minor_options ()
# ------------------------------
# Decode the Autoconf syntax for config files (files, headers, links
# etc.).
-sub split_config_file_spec ($)
+sub split_config_file_spec
{
my ($spec) = @_;
my ($output, @inputs) = split (/:/, $spec);
@@ -4965,7 +4969,7 @@ sub split_config_file_spec ($)
# AC_CONFIG_FILES allow specifications such as Makefile:top.in:mid.in:bot.in
# This functions returns the first *.in file for which a *.am exists.
# It returns undef otherwise.
-sub locate_am (@)
+sub locate_am
{
my (@rest) = @_;
my $input;
@@ -4986,7 +4990,7 @@ my %make_list;
# --------------------------------------------------
# Study $CONFIG-FILES which is the first argument to AC_CONFIG_FILES
# (or AC_OUTPUT).
-sub scan_autoconf_config_files ($$)
+sub scan_autoconf_config_files
{
my ($where, $config_files) = @_;
@@ -5024,7 +5028,7 @@ sub scan_autoconf_config_files ($$)
}
-sub scan_autoconf_traces ($)
+sub scan_autoconf_traces
{
my ($filename) = @_;
@@ -5515,7 +5519,7 @@ sub lang_java_rewrite
# language, etc. A finish function is only called if a source file of
# the appropriate type has been seen.
-sub lang_vala_finish_target ($$)
+sub lang_vala_finish_target
{
my ($self, $name) = @_;
@@ -5628,7 +5632,7 @@ sub lang_vala_finish ()
# The built .c files should be cleaned only on maintainer-clean
# as the .c files are distributed. This function is called for each
# .vala source file.
-sub lang_vala_target_hook ($$$$%)
+sub lang_vala_target_hook
{
my ($self, $aggregate, $output, $input, %transform) = @_;
@@ -5637,7 +5641,7 @@ sub lang_vala_target_hook ($$$$%)
# This is a yacc helper which is called whenever we have decided to
# compile a yacc file.
-sub lang_yacc_target_hook ($$$$%)
+sub lang_yacc_target_hook
{
my ($self, $aggregate, $output, $input, %transform) = @_;
@@ -5713,7 +5717,7 @@ sub lang_yacc_target_hook ($$$$%)
# This is a lex helper which is called whenever we have decided to
# compile a lex file.
-sub lang_lex_target_hook ($$$$%)
+sub lang_lex_target_hook
{
my ($self, $aggregate, $output, $input, %transform) = @_;
# The GNU rules say that yacc/lex output files should be removed
@@ -5758,7 +5762,7 @@ sub lang_lex_finish ()
# precedence. This is lame, but something has to have global
# knowledge in order to eliminate the conflict. Add more linkers as
# required.
-sub resolve_linker (%)
+sub resolve_linker
{
my (%linkers) = @_;
@@ -5770,7 +5774,7 @@ sub resolve_linker (%)
}
# Called to indicate that an extension was used.
-sub saw_extension ($)
+sub saw_extension
{
my ($ext) = @_;
$extension_seen{$ext} = 1;
@@ -5780,7 +5784,7 @@ sub saw_extension ($)
# ------------------------------
# Register a single language.
# Each %ATTRIBUTE is of the form ATTRIBUTE => VALUE.
-sub register_language (%)
+sub register_language
{
my (%option) = @_;
@@ -5833,7 +5837,7 @@ sub register_language (%)
# --------------------------
# This function is used to find a path from a user-specified suffix $EXT
# to $OBJ or to some other suffix we recognize internally, e.g. 'cc'.
-sub derive_suffix ($$)
+sub derive_suffix
{
my ($source_ext, $obj) = @_;
@@ -5850,7 +5854,7 @@ sub derive_suffix ($$)
# Pretty-print something and append to '$output_rules'.
-sub pretty_print_rule ($$@)
+sub pretty_print_rule
{
$output_rules .= makefile_wrap (shift, shift, @_);
}
@@ -5867,7 +5871,7 @@ sub pretty_print_rule ($$@)
# $STRING
# make_conditional_string ($NEGATE, $COND)
# ----------------------------------------
-sub make_conditional_string ($$)
+sub make_conditional_string
{
my ($negate, $cond) = @_;
$cond = "${cond}_TRUE"
@@ -5895,7 +5899,7 @@ my %_am_macro_for_cond =
# $COND
# cond_stack_if ($NEGATE, $COND, $WHERE)
# --------------------------------------
-sub cond_stack_if ($$$)
+sub cond_stack_if
{
my ($negate, $cond, $where) = @_;
@@ -5925,7 +5929,7 @@ sub cond_stack_if ($$$)
# $COND
# cond_stack_else ($NEGATE, $COND, $WHERE)
# ----------------------------------------
-sub cond_stack_else ($$$)
+sub cond_stack_else
{
my ($negate, $cond, $where) = @_;
@@ -5955,7 +5959,7 @@ sub cond_stack_else ($$$)
# $COND
# cond_stack_endif ($NEGATE, $COND, $WHERE)
# -----------------------------------------
-sub cond_stack_endif ($$$)
+sub cond_stack_endif
{
my ($negate, $cond, $where) = @_;
my $old_cond;
@@ -5998,7 +6002,7 @@ sub cond_stack_endif ($$$)
# string to define the variable unconditionally. The third argument
# is a list holding the values to use for the variable. The value is
# pretty printed in the output file.
-sub define_pretty_variable ($$$@)
+sub define_pretty_variable
{
my ($var, $cond, $where, @value) = @_;
@@ -6015,7 +6019,7 @@ sub define_pretty_variable ($$$@)
# --------------------------------------
# Define a new Automake Makefile variable VAR to VALUE, but only if
# not already defined.
-sub define_variable ($$$)
+sub define_variable
{
my ($var, $value, $where) = @_;
define_pretty_variable ($var, TRUE, $where, $value);
@@ -6037,14 +6041,14 @@ sub define_files_variable (address@hidden)
# Like define_variable, but define a variable to be the configure
# substitution by the same name.
-sub define_configure_variable ($)
+sub define_configure_variable
{
my ($var) = @_;
# Some variables we do not want to output. For instance it
# would be a bad idea to output `U = @address@hidden when address@hidden@`
can be
# substituted as `\`.
my $pretty = exists $ignored_configure_vars{$var} ? VAR_SILENT : VAR_ASIS;
- Automake::Variable::define ($var, VAR_CONFIGURE, '', TRUE, subst $var,
+ Automake::Variable::define ($var, VAR_CONFIGURE, '', TRUE, subst ($var),
'', $configure_vars{$var}, $pretty);
}
@@ -6053,7 +6057,7 @@ sub define_configure_variable ($)
# --------------------------------
# Define a compiler variable. We also handle defining the 'LT'
# version of the command when using libtool.
-sub define_compiler_variable ($)
+sub define_compiler_variable
{
my ($lang) = @_;
@@ -6074,7 +6078,7 @@ sub define_compiler_variable ($)
}
-sub define_linker_variable ($)
+sub define_linker_variable
{
my ($lang) = @_;
@@ -6096,7 +6100,7 @@ sub define_linker_variable ($)
define_verbose_tagvar ($lang->lder || 'GEN');
}
-sub define_per_target_linker_variable ($$)
+sub define_per_target_linker_variable
{
my ($linker, $target) = @_;
@@ -6171,7 +6175,7 @@ sub check_trailing_slash ($\$)
# from Makefile.am into $output_trailer, or define variables as
# appropriate. NOTE we put rules in the trailer section. We want
# user rules to come after our generated stuff.
-sub read_am_file ($$$)
+sub read_am_file
{
my ($amfile, $where, $reldir) = @_;
my $canon_reldir = &canonicalize ($reldir);
@@ -6484,7 +6488,10 @@ sub define_standard_variables ()
$output_vars .= $comments . $rules;
}
-sub read_main_am_file ($$)
+
+# read_main_am_file ($MAKEFILE_AM, $MAKEFILE_IN)
+# ----------------------------------------------
+sub read_main_am_file
{
my ($amfile, $infile) = @_;
@@ -6511,8 +6518,10 @@ sub read_main_am_file ($$)
################################################################
-# Flatten the $STRING and return the result.
-sub flatten ($)
+# $STRING
+# flatten ($ORIGINAL_STRING)
+# --------------------------
+sub flatten
{
$_ = shift;
@@ -6529,7 +6538,7 @@ sub flatten ($)
# ---------------------------------------
# Return the value associated to $KEY in %PAIRS, as used on $TOKEN
# (which should be ?KEY? or any of the special %% requests)..
-sub transform_token ($$$)
+sub transform_token ($\%$)
{
my ($token, $transform, $key) = @_;
my $res = $transform->{$key};
@@ -6544,7 +6553,7 @@ sub transform_token ($$$)
# - replaces %KEY% with $VAL,
# - enables/disables ?KEY? and ?!KEY?,
# - replaces %?KEY% with TRUE or FALSE.
-sub transform ($$)
+sub transform ($\%)
{
my ($token, $transform) = @_;
@@ -6553,18 +6562,18 @@ sub transform ($$)
# when there is neither IFTRUE nor IFFALSE.
if ($token =~ /^%([\w\-]+)%$/)
{
- return transform_token ($token, $transform, $1);
+ return transform_token ($token, %$transform, $1);
}
# %?KEY%.
elsif ($token =~ /^%\?([\w\-]+)%$/)
{
- return transform_token ($token, $transform, $1) ? 'TRUE' : 'FALSE';
+ return transform_token ($token, %$transform, $1) ? 'TRUE' : 'FALSE';
}
# ?KEY? and ?!KEY?.
elsif ($token =~ /^ \? (!?) ([\w\-]+) \? $/x)
{
my $neg = ($1 eq '!') ? 1 : 0;
- my $val = transform_token ($token, $transform, $2);
+ my $val = transform_token ($token, %$transform, $2);
return (!!$val == $neg) ? '##%' : '';
}
else
@@ -6579,7 +6588,7 @@ sub transform ($$)
# Load a $MAKEFILE, apply the %TRANSFORM, and return the result.
# No extra parsing or post-processing is done (i.e., recognition of
# rules declaration or of make variables definitions).
-sub preprocess_file ($%)
+sub preprocess_file
{
my ($file, %transform) = @_;
@@ -6631,7 +6640,7 @@ sub preprocess_file ($%)
# Substitute Automake template tokens.
s/(?: % \?? [\w\-]+ %
| \? !? [\w\-]+ \?
- )/transform($&, \%transform)/gex;
+ )/transform($&, %transform)/gex;
# transform() may have added some ##%-comments to strip.
# (we use '##%' instead of '##' so we can distinguish ##%##%##% from
# ####### and do not remove the latter.)
@@ -6646,7 +6655,7 @@ sub preprocess_file ($%)
# -----------------------------------------
# Load a $MAKEFILE, apply the %TRANSFORM, and return it as a list of
# paragraphs.
-sub make_paragraphs ($%)
+sub make_paragraphs
{
my ($file, %transform) = @_;
$transform{FIRST} = !$transformed_files{$file};
@@ -6693,7 +6702,7 @@ sub make_paragraphs ($%)
# Return contents of a file from $libdir/am, automatically skipping
# macros or rules which are already known. $IS_AM iff the caller is
# reading an Automake file (as opposed to the user's Makefile.am).
-sub file_contents_internal ($$$%)
+sub file_contents_internal
{
my ($is_am, $file, $where, %transform) = @_;
@@ -6885,7 +6894,7 @@ sub file_contents_internal ($$$%)
# -----------------------------------------------
# Return contents of a file from $libdir/am, automatically skipping
# macros or rules which are already known.
-sub file_contents ($$%)
+sub file_contents
{
my ($basename, $where, %transform) = @_;
my ($comments, $variables, $rules) =
@@ -6911,7 +6920,7 @@ sub file_contents ($$%)
# variable "zardir" is defined, then "zar_PROGRAMS" becomes valid.
# This is to provide a little extra flexibility in those cases which
# need it.
-sub am_primary_prefixes ($$@)
+sub am_primary_prefixes
{
my ($primary, $can_dist, @prefixes) = @_;
@@ -6988,7 +6997,7 @@ sub am_primary_prefixes ($$@)
# FIXME: this should be rewritten to be cleaner. It should be broken
# up into multiple functions.
#
-sub am_install_var (@)
+sub am_install_var
{
my (@args) = @_;
@@ -7194,7 +7203,9 @@ sub am_install_var (@)
my %make_dirs = ();
my $make_dirs_set = 0;
-sub is_make_dir ($)
+# is_make_dir ($DIRECTORY)
+# ------------------------
+sub is_make_dir
{
my ($dir) = @_;
if (! $make_dirs_set)
@@ -7248,7 +7259,7 @@ sub locate_aux_dir ()
# push_required_file ($DIR, $FILE, $FULLFILE)
# -------------------------------------------
# Push the given file onto DIST_COMMON.
-sub push_required_file ($$$)
+sub push_required_file
{
my ($dir, $file, $fullfile) = @_;
@@ -7335,7 +7346,7 @@ my %required_file_not_found = ();
# required_file_check_or_copy ($WHERE, $DIRECTORY, $FILE)
# -------------------------------------------------------
# Verify that the file must exist in $DIRECTORY, or install it.
-sub required_file_check_or_copy ($$$)
+sub required_file_check_or_copy
{
my ($where, $dir, $file) = @_;
@@ -7447,7 +7458,7 @@ sub required_file_check_or_copy ($$$)
# $MYSTRICT is the strictness level at which this file becomes required.
# Worker threads may queue up the action to be serialized by the master,
# if $QUEUE is true
-sub require_file_internal ($$$@)
+sub require_file_internal
{
my ($where, $mystrict, $dir, $queue, @files) = @_;
@@ -7472,7 +7483,7 @@ sub require_file_internal ($$$@)
# require_file ($WHERE, $MYSTRICT, @FILES)
# ----------------------------------------
-sub require_file ($$@)
+sub require_file
{
my ($where, $mystrict, @files) = @_;
require_file_internal ($where, $mystrict, $relative_dir, 0, @files);
@@ -7480,7 +7491,7 @@ sub require_file ($$@)
# require_file_with_macro ($COND, $MACRO, $MYSTRICT, @FILES)
# ----------------------------------------------------------
-sub require_file_with_macro ($$$@)
+sub require_file_with_macro
{
my ($cond, $macro, $mystrict, @files) = @_;
$macro = rvar ($macro) unless ref $macro;
@@ -7491,7 +7502,7 @@ sub require_file_with_macro ($$$@)
# ---------------------------------------------------------------
# Require an AC_LIBSOURCEd file. If AC_CONFIG_LIBOBJ_DIR was called, it
# must be in that directory. Otherwise expect it in the current directory.
-sub require_libsource_with_macro ($$$@)
+sub require_libsource_with_macro
{
my ($cond, $macro, $mystrict, @files) = @_;
$macro = rvar ($macro) unless ref $macro;
@@ -7507,9 +7518,9 @@ sub require_libsource_with_macro ($$$@)
}
# queue_required_file_check_or_copy ($QUEUE, $KEY, $DIR, $WHERE,
-# $MYSTRICT, @FILES)
+# $MYSTRICT, @FILES)
# --------------------------------------------------------------
-sub queue_required_file_check_or_copy ($$$$@)
+sub queue_required_file_check_or_copy
{
my ($queue, $key, $dir, $where, $mystrict, @files) = @_;
my @serial_loc;
@@ -7526,7 +7537,7 @@ sub queue_required_file_check_or_copy ($$$$@)
# require_queued_file_check_or_copy ($QUEUE)
# ------------------------------------------
-sub require_queued_file_check_or_copy ($)
+sub require_queued_file_check_or_copy
{
my ($queue) = @_;
my $where;
@@ -7560,7 +7571,7 @@ sub require_queued_file_check_or_copy ($)
# require_conf_file ($WHERE, $MYSTRICT, @FILES)
# ---------------------------------------------
# Looks in configuration path, as specified by AC_CONFIG_AUX_DIR.
-sub require_conf_file ($$@)
+sub require_conf_file
{
my ($where, $mystrict, @files) = @_;
my $queue = defined $required_conf_file_queue ? 1 : 0;
@@ -7571,7 +7582,7 @@ sub require_conf_file ($$@)
# require_conf_file_with_macro ($COND, $MACRO, $MYSTRICT, @FILES)
# ---------------------------------------------------------------
-sub require_conf_file_with_macro ($$$@)
+sub require_conf_file_with_macro
{
my ($cond, $macro, $mystrict, @files) = @_;
require_conf_file (rvar ($macro)->rdef ($cond)->location,
@@ -7587,7 +7598,7 @@ sub require_conf_file_with_macro ($$$@)
# dependent upon.
# We don't want to emit the rule twice, and want to reuse it
# for directories with equivalent names (e.g., 'foo/bar' and './foo//bar').
-sub require_build_directory ($)
+sub require_build_directory
{
my $directory = shift;
@@ -7625,7 +7636,7 @@ sub require_build_directory ($)
# If $FILE lies in a subdirectory, emit a rule to create this
# directory and return the file that $FILE should be made
# dependent upon. Otherwise, just return the empty string.
-sub require_build_directory_maybe ($)
+sub require_build_directory_maybe
{
my $file = shift;
my $directory = dirname ($file);
@@ -7643,7 +7654,7 @@ sub require_build_directory_maybe ($)
################################################################
# Push a list of files onto '@dist_common'.
-sub push_dist_common (@)
+sub push_dist_common
{
prog_error "push_dist_common run after handle_dist"
if $handle_dist_run;
@@ -7658,7 +7669,7 @@ sub push_dist_common (@)
# ----------------------------------------------
# Generate a Makefile.in given the name of the corresponding Makefile and
# the name of the file output by config.status.
-sub generate_makefile ($$)
+sub generate_makefile
{
my ($makefile_am, $makefile_in) = @_;
@@ -7838,15 +7849,12 @@ sub generate_makefile ($$)
print $gm_file $output;
}
-################################################################
-
-
-
################################################################
+
# Helper function for usage().
-sub print_autodist_files (@)
+sub print_autodist_files
{
# NOTE: we need to call our 'uniq' function with the leading '&'
# here, because otherwise perl complains that "Unquoted string
@@ -8025,7 +8033,9 @@ sub parse_arguments ()
}
-sub handle_makefile ($)
+# handle_makefile ($MAKEFILE)
+# ---------------------------
+sub handle_makefile
{
my ($file) = @_;
($am_file = $file) =~ s/\.in$//;
@@ -8084,7 +8094,7 @@ sub get_number_of_threads ()
#
# The latter requires that the makefile that deals with the aux dir
# files be handled last, done by the master thread.
-sub handle_makefiles_threaded ($)
+sub handle_makefiles_threaded
{
my ($nthreads) = @_;
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 191e9d5..e3f551a 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -323,7 +323,7 @@ sub _process_option_list (\%@)
error ($where,
"automatic de-ANSI-fication support has been removed");
}
- # TODO: Remove this special check in Automake 1.15.
+ # TODO: Remove this special check in Automake 3.0.
elsif ($_ eq 'cygnus')
{
error $where, "support for Cygnus-style trees has been removed";
diff --git a/m4/depout.m4 b/m4/depout.m4
index 880a597..c79d04b 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -40,7 +40,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
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
+ 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
diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
index d7cf488..704562d 100755
--- a/t/preproc-errmsg.sh
+++ b/t/preproc-errmsg.sh
@@ -65,10 +65,13 @@ sub/local.mk:4: library has 'sub_x2' as canonical name
(possible typo)
Makefile.am:2: 'sub/local.mk' included from here
END
-sed -e '/warnings are treated as errors/d' \
- -e 's/: warning:/:/' -e 's/: error:/:/' \
- -e 's/ */ /g' \
- <stderr >obtained
+# We need to break these substitutions into multiple sed invocations
+# to avoid spuriously triggering the 'sc_tests_logs_duplicate_prefixes'
+# maintainer check.
+sed -e '/warnings are treated as errors/d' stderr > t1
+sed -e 's/: warning:/:/' t1 > t2
+sed -e 's/: error:/:/' t2 > t3
+sed -e 's/ */ /g' t3 > obtained
diff expected obtained
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1b-163-gd03bc76,
Stefano Lattarini <=