[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Automake branch, master, updated. Release-1-10-74-g1d0c65c
|
From: |
Akim Demaille |
|
Subject: |
[SCM] GNU Automake branch, master, updated. Release-1-10-74-g1d0c65c |
|
Date: |
Sat, 24 Nov 2007 10:24:28 +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=1d0c65c8894d499ad034c9cc189808d4ecd3db5c
The branch, master has been updated
via 1d0c65c8894d499ad034c9cc189808d4ecd3db5c (commit)
from 88d1f07e102807518eef06b1ff5279bb40eb2202 (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 1d0c65c8894d499ad034c9cc189808d4ecd3db5c
Author: Akim Demaille <address@hidden>
Date: Sat Nov 24 10:10:11 2007 +0100
Normalize white spaces
* automake.in: Normalize white spaces.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 +
automake.in | 504 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 256 insertions(+), 252 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6ab9e8e..5fecbf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-24 Akim Demaille <address@hidden>
+
+ * automake.in: Normalize white spaces.
+
2007-11-24 Ralf Wildenhues <address@hidden>
* configure.ac (ACLOCAL, AUTOMAKE): Fix quoting for rebuilding
diff --git a/automake.in b/automake.in
index 3b96f1b..17d0241 100755
--- a/automake.in
+++ b/automake.in
@@ -47,14 +47,14 @@ BEGIN
use Automake::Struct;
struct (# Short name of the language (c, f77...).
- 'name' => "\$",
- # Nice name of the language (C, Fortran 77...).
- 'Name' => "\$",
+ 'name' => "\$",
+ # Nice name of the language (C, Fortran 77...).
+ 'Name' => "\$",
# List of configure variables which must be defined.
'config_vars' => '@',
- 'ansi' => "\$",
+ 'ansi' => "\$",
# `pure' is `1' or `'. A `pure' language is one where, if
# all the files in a directory are of that language, then we
# do not require the C compiler or any code to call it.
@@ -63,19 +63,19 @@ struct (# Short name of the language (c, f77...).
'autodep' => "\$",
# Name of the compiling variable (COMPILE).
- 'compiler' => "\$",
- # Content of the compiling variable.
- 'compile' => "\$",
- # Flag to require compilation without linking (-c).
- 'compile_flag' => "\$",
- 'extensions' => '@',
+ 'compiler' => "\$",
+ # Content of the compiling variable.
+ 'compile' => "\$",
+ # Flag to require compilation without linking (-c).
+ 'compile_flag' => "\$",
+ 'extensions' => '@',
# A subroutine to compute a list of possible extensions of
# the product given the input extensions.
# (defaults to a subroutine which returns ('.$(OBJEXT)', '.lo'))
'output_extensions' => "\$",
# A list of flag variables used in 'compile'.
# (defaults to [])
- 'flags' => "@",
+ 'flags' => "@",
# Any tag to pass to libtool while compiling.
'libtool_tag' => "\$",
@@ -84,19 +84,19 @@ struct (# Short name of the language (c, f77...).
# The default is 'depend2'.
'rule_file' => "\$",
- # Name of the linking variable (LINK).
- 'linker' => "\$",
- # Content of the linking variable.
- 'link' => "\$",
+ # Name of the linking variable (LINK).
+ 'linker' => "\$",
+ # Content of the linking variable.
+ 'link' => "\$",
- # Name of the linker variable (LD).
- 'lder' => "\$",
- # Content of the linker variable ($(CC)).
- 'ld' => "\$",
+ # Name of the linker variable (LD).
+ 'lder' => "\$",
+ # Content of the linker variable ($(CC)).
+ 'ld' => "\$",
- # Flag to specify the output file (-o).
- 'output_flag' => "\$",
- '_finish' => "\$",
+ # Flag to specify the output file (-o).
+ 'output_flag' => "\$",
+ '_finish' => "\$",
# This is a subroutine which is called whenever we finally
# determine the context in which a source file will be
@@ -238,7 +238,7 @@ my @common_sometimes =
# pkg* directories from Automake. Stored in a hash for fast member check.
my %standard_prefix =
map { $_ => 1 } (qw(bin data dataroot dvi exec html include info
- lib libexec lisp localstate man man1 man2 man3
+ lib libexec lisp localstate man man1 man2 man3
man4 man5 man6 man7 man8 man9 oldinclude pdf
pkgdatadir pkgincludedir pkglibdir pkglibexecdir
ps sbin sharedstate sysconf));
@@ -737,7 +737,7 @@ register_language ('name' => 'objc',
'Name' => 'Objective C',
'config_vars' => ['OBJC'],
'linker' => 'OBJCLINK',
- 'link' => '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS)
$(AM_LDFLAGS) $(LDFLAGS) -o $@',
+ 'link' => '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS)
$(AM_LDFLAGS) $(LDFLAGS) -o $@',
'autodep' => 'OBJC',
'flags' => ['OBJCFLAGS', 'CPPFLAGS'],
'compile' => '$(OBJC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)',
@@ -754,7 +754,7 @@ register_language ('name' => 'upc',
'Name' => 'Unified Parallel C',
'config_vars' => ['UPC'],
'linker' => 'UPCLINK',
- 'link' => '$(UPCLD) $(AM_UPCFLAGS) $(UPCFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
+ 'link' => '$(UPCLD) $(AM_UPCFLAGS) $(UPCFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
'autodep' => 'UPC',
'flags' => ['UPCFLAGS', 'CPPFLAGS'],
'compile' => '$(UPC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_UPCFLAGS) $(UPCFLAGS)',
@@ -1079,7 +1079,7 @@ sub handle_options
}
foreach my $locvals ($var->value_as_list_recursive (cond_filter => TRUE,
location => 1))
- {
+ {
my ($loc, $value) = @$locvals;
return 1 if (process_option_list ($loc, $value))
}
@@ -1181,7 +1181,7 @@ sub handle_languages
# seems safest.
$output_rules .= "\n";
foreach my $iter (@deplist)
- {
+ {
$output_rules .= (subst ('AMDEP_TRUE')
. subst ('am__include')
. ' '
@@ -1606,9 +1606,9 @@ sub handle_single_transform ($$$$$%)
{
$_ = shift @files;
- # Configure substitutions in _SOURCES variables are errors.
- if (/address@hidden@$/)
- {
+ # Configure substitutions in _SOURCES variables are errors.
+ if (/address@hidden@$/)
+ {
my $parent_msg = '';
$parent_msg = "\nand is referred to from `$topparent'"
if $topparent ne $var->name;
@@ -1617,22 +1617,22 @@ sub handle_single_transform ($$$$$%)
. $parent_msg . ";\nconfigure " .
"substitutions are not allowed in _SOURCES variables");
next;
- }
+ }
- # If the source file is in a subdirectory then the `.o' is put
- # into the current directory, unless the subdir-objects option
- # is in effect.
+ # If the source file is in a subdirectory then the `.o' is put
+ # into the current directory, unless the subdir-objects option
+ # is in effect.
- # Split file name into base and extension.
- next if ! /^(?:(.*)\/)?([^\/]*)($KNOWN_EXTENSIONS_PATTERN)$/;
- my $full = $_;
- my $directory = $1 || '';
- my $base = $2;
- my $extension = $3;
+ # Split file name into base and extension.
+ next if ! /^(?:(.*)\/)?([^\/]*)($KNOWN_EXTENSIONS_PATTERN)$/;
+ my $full = $_;
+ my $directory = $1 || '';
+ my $base = $2;
+ my $extension = $3;
- # We must generate a rule for the object if it requires its own flags.
- my $renamed = 0;
- my ($linker, $object);
+ # We must generate a rule for the object if it requires its own flags.
+ my $renamed = 0;
+ my ($linker, $object);
# This records whether we've seen a derived source file (e.g.
# yacc output).
@@ -1645,13 +1645,13 @@ sub handle_single_transform ($$$$$%)
# language function.
my $aggregate = 'AM';
- $extension = &derive_suffix ($extension, $nonansi_obj);
- my $lang;
- if ($extension_map{$extension} &&
- ($lang = $languages{$extension_map{$extension}}))
+ $extension = &derive_suffix ($extension, $nonansi_obj);
+ my $lang;
+ if ($extension_map{$extension} &&
+ ($lang = $languages{$extension_map{$extension}}))
{
- # Found the language, so see what it says.
- &saw_extension ($extension);
+ # Found the language, so see what it says.
+ &saw_extension ($extension);
# Do we have per-executable flags for this executable?
my $have_per_exec_flags = 0;
@@ -1666,24 +1666,24 @@ sub handle_single_transform ($$$$$%)
}
}
- # Note: computed subr call. The language rewrite function
- # should return one of the LANG_* constants. It could
- # also return a list whose first value is such a constant
- # and whose second value is a new source extension which
- # should be applied. This means this particular language
- # generates another source file which we must then process
- # further.
- my $subr = \&{'lang_' . $lang->name . '_rewrite'};
- my ($r, $source_extension)
+ # Note: computed subr call. The language rewrite function
+ # should return one of the LANG_* constants. It could
+ # also return a list whose first value is such a constant
+ # and whose second value is a new source extension which
+ # should be applied. This means this particular language
+ # generates another source file which we must then process
+ # further.
+ my $subr = \&{'lang_' . $lang->name . '_rewrite'};
+ my ($r, $source_extension)
= &$subr ($directory, $base, $extension,
$nonansi_obj, $have_per_exec_flags, $var);
- # Skip this entry if we were asked not to process it.
- next if $r == LANG_IGNORE;
+ # Skip this entry if we were asked not to process it.
+ next if $r == LANG_IGNORE;
- # Now extract linker and other info.
- $linker = $lang->linker;
+ # Now extract linker and other info.
+ $linker = $lang->linker;
- my $this_obj_ext;
+ my $this_obj_ext;
if (defined $source_extension)
{
$this_obj_ext = $source_extension;
@@ -1699,43 +1699,43 @@ sub handle_single_transform ($$$$$%)
}
$object = $base . $this_obj_ext;
- if ($have_per_exec_flags)
- {
- # We have a per-executable flag in effect for this
- # object. In this case we rewrite the object's
- # name to ensure it is unique.
-
- # We choose the name `DERIVED_OBJECT' to ensure
- # (1) uniqueness, and (2) continuity between
- # invocations. However, this will result in a
- # name that is too long for losing systems, in
- # some situations. So we provide _SHORTNAME to
- # override.
-
- my $dname = $derived;
+ if ($have_per_exec_flags)
+ {
+ # We have a per-executable flag in effect for this
+ # object. In this case we rewrite the object's
+ # name to ensure it is unique.
+
+ # We choose the name `DERIVED_OBJECT' to ensure
+ # (1) uniqueness, and (2) continuity between
+ # invocations. However, this will result in a
+ # name that is too long for losing systems, in
+ # some situations. So we provide _SHORTNAME to
+ # override.
+
+ my $dname = $derived;
my $var = var ($derived . '_SHORTNAME');
- if ($var)
- {
- # FIXME: should use the same Condition as
- # the _SOURCES variable. But this is really
- # silly overkill -- nobody should have
- # conditional shortnames.
- $dname = $var->variable_value;
- }
- $object = $dname . '-' . $object;
+ if ($var)
+ {
+ # FIXME: should use the same Condition as
+ # the _SOURCES variable. But this is really
+ # silly overkill -- nobody should have
+ # conditional shortnames.
+ $dname = $var->variable_value;
+ }
+ $object = $dname . '-' . $object;
prog_error ($lang->name . " flags defined without compiler")
if ! defined $lang->compile;
- $renamed = 1;
- }
+ $renamed = 1;
+ }
- # If rewrite said it was ok, put the object into a
- # subdir.
- if ($r == LANG_SUBDIR && $directory ne '')
- {
- $object = $directory . '/' . $object;
- }
+ # If rewrite said it was ok, put the object into a
+ # subdir.
+ if ($r == LANG_SUBDIR && $directory ne '')
+ {
+ $object = $directory . '/' . $object;
+ }
# If the object file has been renamed (because per-target
# flags are used) we cannot compile the file with an
@@ -1766,13 +1766,13 @@ sub handle_single_transform ($$$$$%)
# Using inference rules for subdir-objects has been tested
# with GNU make, Solaris make, Ultrix make, BSD make,
# HP-UX make, and OSF1 make successfully.
- if ($renamed
+ if ($renamed
|| ($directory ne '' && ! option 'subdir-objects')
# We must also use specific rules for a nodist_ source
# if its language requests it.
|| ($lang->nodist_specific && ! $transform{'DIST_SOURCE'}))
- {
- my $obj_sans_ext = substr ($object, 0,
+ {
+ my $obj_sans_ext = substr ($object, 0,
- length ($this_obj_ext));
my $full_ansi = $full;
if ($lang->ansi && option 'ansi2knr')
@@ -1786,7 +1786,7 @@ sub handle_single_transform ($$$$$%)
# source case because in the other case we
# *don't* want $(OBJEXT) to appear here.
($derived_source ? $this_obj_ext : '.o'),
- $extension);
+ $extension);
# If we renamed the object then we want to use the
# per-executable flag name. But if this is simply a
@@ -1808,28 +1808,28 @@ sub handle_single_transform ($$$$$%)
# (e.g. for `foo_CFLAGS', it is `foo'), the name of the
# source file, the base name of the output file, and
# the extension for the object file.
- push (@{$lang_specific_files{$lang->name}},
+ push (@{$lang_specific_files{$lang->name}},
address@hidden, %transform]);
- }
- }
- elsif ($extension eq $nonansi_obj)
- {
- # This is probably the result of a direct suffix rule.
- # In this case we just accept the rewrite.
- $object = "$base$extension";
- $object = "$directory/$object" if $directory ne '';
- $linker = '';
- }
- else
- {
- # No error message here. Used to have one, but it was
- # very unpopular.
+ }
+ }
+ elsif ($extension eq $nonansi_obj)
+ {
+ # This is probably the result of a direct suffix rule.
+ # In this case we just accept the rewrite.
+ $object = "$base$extension";
+ $object = "$directory/$object" if $directory ne '';
+ $linker = '';
+ }
+ else
+ {
+ # No error message here. Used to have one, but it was
+ # very unpopular.
# FIXME: we could potentially do more processing here,
# perhaps treating the new extension as though it were a
# new source extension (as above). This would require
# more restructuring than is appropriate right now.
- next;
- }
+ next;
+ }
err_am "object `$object' created by `$full' and `$object_map{$object}'"
if (defined $object_map{$object}
@@ -1869,25 +1869,25 @@ sub handle_single_transform ($$$$$%)
next;
}
- $linkers_used{$linker} = 1;
+ $linkers_used{$linker} = 1;
- push (@result, $object);
+ push (@result, $object);
- if (! defined $object_map{$object})
- {
- my @dep_list = ();
- $object_map{$object} = $full;
+ if (! defined $object_map{$object})
+ {
+ my @dep_list = ();
+ $object_map{$object} = $full;
- # If resulting object is in subdir, we need to make
- # sure the subdir exists at build time.
- if ($object =~ /\//)
- {
- # FIXME: check that $DIRECTORY is somewhere in the
- # project
+ # If resulting object is in subdir, we need to make
+ # sure the subdir exists at build time.
+ if ($object =~ /\//)
+ {
+ # FIXME: check that $DIRECTORY is somewhere in the
+ # project
# For Java, the way we're handling it right now, a
# `..' component doesn't make sense.
- if ($lang && $lang->name eq 'java' && $object =~
/(\/|^)\.\.\//)
+ if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
{
err_am "`$full' should not contain a `..' component";
}
@@ -1905,30 +1905,30 @@ sub handle_single_transform ($$$$$%)
$libtool_clean_directories{$directory} = 1;
}
- push (@dep_list, require_build_directory ($directory));
+ push (@dep_list, require_build_directory ($directory));
- # If we're generating dependencies, we also want
- # to make sure that the appropriate subdir of the
- # .deps directory is created.
+ # If we're generating dependencies, we also want
+ # to make sure that the appropriate subdir of the
+ # .deps directory is created.
push (@dep_list,
require_build_directory ($directory . '/$(DEPDIR)'))
unless option 'no-dependencies';
- }
-
- &pretty_print_rule ($object . ':', "\t", @dep_list)
- if scalar @dep_list > 0;
- }
-
- # Transform .o or $o file into .P file (for automatic
- # dependency code).
- if ($lang && $lang->autodep ne 'no')
- {
- my $depfile = $object;
- $depfile =~ s/\.([^.]*)$/.P$1/;
- $depfile =~ s/\$\(OBJEXT\)$/o/;
- $dep_files{dirname ($depfile) . '/$(DEPDIR)/'
+ }
+
+ &pretty_print_rule ($object . ':', "\t", @dep_list)
+ if scalar @dep_list > 0;
+ }
+
+ # Transform .o or $o file into .P file (for automatic
+ # dependency code).
+ if ($lang && $lang->autodep ne 'no')
+ {
+ my $depfile = $object;
+ $depfile =~ s/\.([^.]*)$/.P$1/;
+ $depfile =~ s/\$\(OBJEXT\)$/o/;
+ $dep_files{dirname ($depfile) . '/$(DEPDIR)/'
. basename ($depfile)} = 1;
- }
+ }
}
return @result;
@@ -2022,8 +2022,8 @@ sub handle_source_transform ($$$$%)
unless $prefix =~ /EXTRA_/;
push @sources, "\$($varname)";
- push @dist_sources, shadow_unconditionally ($varname, $where)
- unless (option ('no-dist') || $prefix =~ /^nodist_/);
+ push @dist_sources, shadow_unconditionally ($varname, $where)
+ unless (option ('no-dist') || $prefix =~ /^nodist_/);
$needlinker |=
define_objects_from_sources ($varname,
@@ -2693,7 +2693,7 @@ sub handle_ltlibraries
{
return ();
},
- skip_ac_subst => 1);
+ skip_ac_subst => 1);
}
foreach my $pair (@liblist)
@@ -2722,13 +2722,13 @@ sub handle_ltlibraries
my $bn = basename ($onelib);
if ($bn !~ /$libname_rx$/)
{
- my $type = 'library';
- if ($libname_rx eq '\.la')
+ my $type = 'library';
+ if ($libname_rx eq '\.la')
{
$bn =~ s/^(lib|)(.*?)(?:\.[^.]*)?$/$1$2.la/;
- $type = 'module';
+ $type = 'module';
}
- else
+ else
{
$bn =~ s/^(?:lib)?(.*?)(?:\.[^.]*)?$/lib$1.la/;
}
@@ -2773,7 +2773,7 @@ sub handle_ltlibraries
my $rpathvar = "am_${xlib}_rpath";
my $rpath = "\$($rpathvar)";
foreach my $rcond ($instconds{$onelib}->conds)
- {
+ {
my $val;
if ($instdirs{$onelib}{$rcond} eq 'EXTRA'
|| $instdirs{$onelib}{$rcond} eq 'noinst'
@@ -3555,11 +3555,11 @@ sub user_phony_rule ($)
sub for_dist_common
{
return 0
- if $a eq $b;
+ if $a eq $b;
return -1
- if $a eq 'README';
+ if $a eq 'README';
return 1
- if $b eq 'README';
+ if $b eq 'README';
return $a cmp $b;
}
@@ -3944,9 +3944,9 @@ sub handle_configure ($$$@)
'MAKEFILE-IN-DEPS' => "@include_stack",
'MAKEFILE-AM' => $rel_makefile_am,
STRICTNESS => global_option 'cygnus'
- ? 'cygnus' : $strictness_name,
+ ? 'cygnus' : $strictness_name,
'USE-DEPS' => global_option 'no-dependencies'
- ? ' --ignore-deps' : '',
+ ? ' --ignore-deps' : '',
'MAKEFILE-AM-SOURCES' => "$makefile$colon_infile",
'REGEN-ACLOCAL-M4' => $regen_aclocal_m4);
@@ -4330,7 +4330,7 @@ sub handle_all ($)
foreach my $spec (@config_headers)
{
- my ($out, @ins) = split_config_file_spec ($spec);
+ my ($out, @ins) = split_config_file_spec ($spec);
push (@all, basename ($out))
if dirname ($out) eq $relative_dir;
}
@@ -4350,7 +4350,7 @@ sub handle_all ($)
if var ('BUILT_SOURCES');
foreach my $spec (@config_headers)
{
- my ($out, @ins) = split_config_file_spec ($spec);
+ my ($out, @ins) = split_config_file_spec ($spec);
push @local_headers, basename ($out)
if dirname ($out) eq $relative_dir;
}
@@ -4611,7 +4611,7 @@ sub handle_tests
# For matching purposes, we need to adjust XFAIL_TESTS as well.
append_exeext { exists $known_programs{$_[0]} } 'TESTS';
append_exeext { exists $known_programs{$_[0]} } 'XFAIL_TESTS'
- if (var ('XFAIL_TESTS'));
+ if (var ('XFAIL_TESTS'));
}
}
@@ -4764,16 +4764,16 @@ sub scan_autoconf_config_files ($$)
if ($local =~ /^\.\//);
my $input = locate_am @rest;
if ($input)
- {
+ {
# We have a file that automake should generate.
$make_list{$input} = join (':', ($local, @rest));
- }
+ }
else
- {
+ {
# We have a file that automake should cause to be
# rebuilt, but shouldn't generate itself.
push (@other_input_files, $_);
- }
+ }
$ac_config_files_location{$local} = $where;
}
}
@@ -4801,7 +4801,7 @@ sub scan_autoconf_traces ($)
AC_FC_SRCEXT => 1,
AC_INIT => 0,
AC_LIBSOURCE => 1,
- AC_REQUIRE_AUX_FILE => 1,
+ AC_REQUIRE_AUX_FILE => 1,
AC_SUBST_TRACE => 1,
AM_AUTOMAKE_VERSION => 1,
AM_CONDITIONAL => 2,
@@ -4811,7 +4811,7 @@ sub scan_autoconf_traces ($)
AM_INIT_AUTOMAKE => 0,
AM_MAINTAINER_MODE => 0,
AM_PROG_CC_C_O => 0,
- _AM_SUBST_NOTMAKE => 1,
+ _AM_SUBST_NOTMAKE => 1,
LT_SUPPORTED_TAG => 1,
_LT_AC_TAGCONFIG => 0,
m4_include => 1,
@@ -4912,7 +4912,7 @@ sub scan_autoconf_traces ($)
}
}
elsif ($macro eq 'AC_FC_SRCEXT')
- {
+ {
my $suffix = $args[1];
# These flags are used as %SOURCEFLAG% in depend2.am,
# where the trailing space is important.
@@ -4920,7 +4920,7 @@ sub scan_autoconf_traces ($)
if ($suffix eq 'f90' || $suffix eq 'f95');
}
elsif ($macro eq 'AC_INIT')
- {
+ {
if (defined $args[2])
{
$package_version = $args[2];
@@ -4933,9 +4933,9 @@ sub scan_autoconf_traces ($)
}
elsif ($macro eq 'AC_REQUIRE_AUX_FILE')
{
- # Only remember the first time a file is required.
+ # Only remember the first time a file is required.
$required_aux_file{$args[1]} = $where
- unless exists $required_aux_file{$args[1]};
+ unless exists $required_aux_file{$args[1]};
}
elsif ($macro eq 'AC_SUBST_TRACE')
{
@@ -4945,7 +4945,7 @@ sub scan_autoconf_traces ($)
if $args[1] =~ /^\w+$/;
}
elsif ($macro eq 'AM_AUTOMAKE_VERSION')
- {
+ {
error ($where,
"version mismatch. This is Automake $VERSION,\n" .
"but the definition used by this AM_INIT_AUTOMAKE\n" .
@@ -4956,11 +4956,11 @@ sub scan_autoconf_traces ($)
if $VERSION ne $args[1];
$seen_automake_version = 1;
- }
+ }
elsif ($macro eq 'AM_CONDITIONAL')
{
$configure_cond{$args[1]} = $where;
- }
+ }
elsif ($macro eq 'AM_ENABLE_MULTILIB')
{
$seen_multilib = $where;
@@ -5006,8 +5006,8 @@ sub scan_autoconf_traces ($)
|| $macro eq 'm4_sinclude'
|| $macro eq 'sinclude')
{
- # Skip missing `sinclude'd files.
- next if $macro ne 'm4_include' && ! -f $args[1];
+ # Skip missing `sinclude'd files.
+ next if $macro ne 'm4_include' && ! -f $args[1];
# Some modified versions of Autoconf don't use
# frozen files. Consequently it's possible that we see all
@@ -5026,7 +5026,7 @@ sub scan_autoconf_traces ($)
}
elsif ($macro eq 'LT_SUPPORTED_TAG')
{
- $libtool_tags{$args[1]} = 1;
+ $libtool_tags{$args[1]} = 1;
$libtool_new_api = 1;
}
elsif ($macro eq '_LT_AC_TAGCONFIG')
@@ -5430,10 +5430,10 @@ sub lang_c_finish
if (option 'ansi2knr' && keys %de_ansi_files)
{
- # Make all _.c files depend on their corresponding .c files.
- my @objects;
- foreach my $base (sort keys %de_ansi_files)
- {
+ # Make all _.c files depend on their corresponding .c files.
+ my @objects;
+ foreach my $base (sort keys %de_ansi_files)
+ {
# Each _.c file must depend on ansi2knr; otherwise it
# might be used in a parallel build before it is built.
# We need to support files in the srcdir and in the build
@@ -5441,7 +5441,7 @@ sub lang_c_finish
# we can't use $< -- some makes only define $< during a
# suffix rule.
my $ansfile = $de_ansi_files{$base} . $base . '.c';
- $output_rules .= ($base . "_.c: $ansfile \$(ANSI2KNR)\n\t"
+ $output_rules .= ($base . "_.c: $ansfile \$(ANSI2KNR)\n\t"
. '$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) '
. '`if test -f $(srcdir)/' . $ansfile
. '; then echo $(srcdir)/' . $ansfile
@@ -5451,8 +5451,8 @@ sub lang_c_finish
# If ansi2knr fails then we shouldn't
# create the _.c file
. " || rm -f address@hidden");
- push (@objects, $base . '_.$(OBJEXT)');
- push (@objects, $base . '_.lo')
+ push (@objects, $base . '_.$(OBJEXT)');
+ push (@objects, $base . '_.lo')
if var ('LIBTOOL');
# Explicitly clean the _.c files if they are in a
@@ -5460,11 +5460,11 @@ sub lang_c_finish
# by a `rm -f *_.c' rule.)
$clean_files{$base . '_.c'} = MOSTLY_CLEAN
if dirname ($base) ne '.';
- }
+ }
- # Make all _.o (and _.lo) files depend on ansi2knr.
- # Use a sneaky little hack to make it print nicely.
- &pretty_print_rule ('', '', @objects, ':', '$(ANSI2KNR)');
+ # Make all _.o (and _.lo) files depend on ansi2knr.
+ # Use a sneaky little hack to make it print nicely.
+ &pretty_print_rule ('', '', @objects, ':', '$(ANSI2KNR)');
}
}
@@ -5622,7 +5622,7 @@ sub count_files_for_language
foreach my $ext (@{$lang->extensions})
{
$r += $extension_seen{$ext}
- if defined $extension_seen{$ext};
+ if defined $extension_seen{$ext};
}
}
@@ -5760,7 +5760,7 @@ sub make_conditional_string ($$)
my %_am_macro_for_cond =
(
AMDEP => "one of the compiler tests\n"
- . " AC_PROG_CC, AC_PROG_CXX, AC_PROG_CXX, AC_PROG_OBJC,\n"
+ . " AC_PROG_CC, AC_PROG_CXX, AC_PROG_CXX, AC_PROG_OBJC,\n"
. " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC",
am__fastdepCC => 'AC_PROG_CC',
am__fastdepCCAS => 'AM_PROG_AS',
@@ -5782,7 +5782,7 @@ sub cond_stack_if ($$$)
my $text = "$cond does not appear in AM_CONDITIONAL";
my $scope = US_LOCAL;
if (exists $_am_macro_for_cond{$cond})
- {
+ {
my $mac = $_am_macro_for_cond{$cond};
$text .= "\n The usual way to define `$cond' is to add ";
$text .= ($mac =~ / /) ? $mac : "`$mac'";
@@ -5882,7 +5882,7 @@ sub define_pretty_variable ($$$@)
if (! vardef ($var, $cond))
{
- Automake::Variable::define ($var, VAR_AUTOMAKE, '', $cond, "@value",
+ Automake::Variable::define ($var, VAR_AUTOMAKE, '', $cond, "@value",
'', $where, VAR_PRETTY);
rvar ($var)->rdef ($cond)->set_seen;
}
@@ -6079,7 +6079,7 @@ sub read_am_file ($$)
while ($_ = $am_file->getline)
{
- $where->set ("$amfile:$.");
+ $where->set ("$amfile:$.");
if (/$IGNORE_PATTERN/o)
{
# Merely delete comments beginning with two hashes.
@@ -6128,7 +6128,7 @@ sub read_am_file ($$)
# FIXME: shouldn't use $_ in this loop; it is too big.
while ($_)
{
- $where->set ("$amfile:$.");
+ $where->set ("$amfile:$.");
# Make sure the line is \n-terminated.
chomp;
@@ -6231,7 +6231,7 @@ sub read_am_file ($$)
$output_trailer .= $comment . $spacing;
my $cond = new Automake::Condition @cond_stack;
$output_trailer .= $cond->subst_string;
- $output_trailer .= $_;
+ $output_trailer .= $_;
$comment = $spacing = '';
}
elsif (/$ASSIGNMENT_PATTERN/o)
@@ -6274,13 +6274,13 @@ sub read_am_file ($$)
$var_look = VAR_ASIS;
}
}
- elsif (/$INCLUDE_PATTERN/o)
- {
- my $path = $1;
+ elsif (/$INCLUDE_PATTERN/o)
+ {
+ my $path = $1;
- if ($path =~ s/^\$\(top_srcdir\)\///)
+ if ($path =~ s/^\$\(top_srcdir\)\///)
{
- push (@include_stack, "\$\(top_srcdir\)/$path");
+ push (@include_stack, "\$\(top_srcdir\)/$path");
# Distribute any included file.
# Always use the $(top_srcdir) prefix in DIST_COMMON,
@@ -6290,10 +6290,10 @@ sub read_am_file ($$)
# (subdircond2.test and subdircond3.test will fail.)
push_dist_common ("\$\(top_srcdir\)/$path");
}
- else
+ else
{
- $path =~ s/\$\(srcdir\)\///;
- push (@include_stack, "\$\(srcdir\)/$path");
+ $path =~ s/\$\(srcdir\)\///;
+ push (@include_stack, "\$\(srcdir\)/$path");
# Always use the $(srcdir) prefix in DIST_COMMON,
# otherwise OSF make will implicitly copy the included
# file in the build tree during `make distdir' to satisfy
@@ -6303,11 +6303,11 @@ sub read_am_file ($$)
$path = $relative_dir . "/" . $path if $relative_dir ne '.';
}
$where->push_context ("`$path' included from here");
- &read_am_file ($path, $where);
+ &read_am_file ($path, $where);
$where->pop_context;
- }
+ }
else
- {
+ {
# This isn't an error; it is probably a continued rule.
# In fact, this is what we assume.
$prev_state = IN_RULE_DEF;
@@ -6322,7 +6322,7 @@ sub read_am_file ($$)
}
$saw_bk = $new_saw_bk;
- $_ = $am_file->getline;
+ $_ = $am_file->getline;
}
$output_trailer .= $comment;
@@ -6564,31 +6564,31 @@ sub file_contents_internal ($$$%)
foreach (make_paragraphs ($file, %transform))
{
- # FIXME: no line number available.
- $where->set ($file);
+ # FIXME: no line number available.
+ $where->set ($file);
- # Sanity checks.
+ # Sanity checks.
error $where, "blank line following trailing backslash:\n$_"
if /\\$/;
error $where, "comment following trailing backslash:\n$_"
if /\\#/;
- if (/^$/)
- {
+ if (/^$/)
+ {
$is_rule = 0;
- # Stick empty line before the incoming macro or rule.
- $spacing = "\n";
- }
- elsif (/$COMMENT_PATTERN/mso)
- {
+ # Stick empty line before the incoming macro or rule.
+ $spacing = "\n";
+ }
+ elsif (/$COMMENT_PATTERN/mso)
+ {
$is_rule = 0;
- # Stick comments before the incoming macro or rule.
- $comment = "$_\n";
+ # Stick comments before the incoming macro or rule.
+ $comment = "$_\n";
}
# Handle inclusion of other files.
- elsif (/$INCLUDE_PATTERN/o)
- {
+ elsif (/$INCLUDE_PATTERN/o)
+ {
if ($cond != FALSE)
{
my $file = ($is_am ? "$libdir/am/" : '') . $1;
@@ -6601,10 +6601,10 @@ sub file_contents_internal ($$$%)
$result_vars .= $vars;
$result_rules .= $rules;
}
- }
+ }
- # Handling the conditionals.
- elsif (/$IF_PATTERN/o)
+ # Handling the conditionals.
+ elsif (/$IF_PATTERN/o)
{
$cond = cond_stack_if ($1, $2, $file);
}
@@ -6617,9 +6617,9 @@ sub file_contents_internal ($$$%)
$cond = cond_stack_endif ($1, $2, $file);
}
- # Handling rules.
- elsif (/$RULE_PATTERN/mso)
- {
+ # Handling rules.
+ elsif (/$RULE_PATTERN/mso)
+ {
$is_rule = 1;
$discard_rule = 0;
# Separate relationship from optional actions: the first
@@ -6693,12 +6693,12 @@ sub file_contents_internal ($$$%)
last;
}
}
- }
+ }
- elsif (/$ASSIGNMENT_PATTERN/mso)
- {
+ elsif (/$ASSIGNMENT_PATTERN/mso)
+ {
my ($var, $type, $val) = ($1, $2, $3);
- error $where, "variable `$var' with trailing backslash"
+ error $where, "variable `$var' with trailing backslash"
if /\\$/;
$is_rule = 0;
@@ -6709,20 +6709,20 @@ sub file_contents_internal ($$$%)
VAR_ASIS)
if $cond != FALSE;
- $comment = $spacing = '';
- }
- else
- {
+ $comment = $spacing = '';
+ }
+ else
+ {
# This isn't an error; it is probably some tokens which
# configure is supposed to replace, such as address@hidden@',
# or some part of a rule cut by an if/endif.
- if (! $cond->false && ! ($is_rule && $discard_rule))
+ if (! $cond->false && ! ($is_rule && $discard_rule))
{
s/^/$cond->subst_string/gme;
$result_rules .= "$spacing$comment$_\n";
}
- $comment = $spacing = '';
- }
+ $comment = $spacing = '';
+ }
}
error ($where, @cond_stack ?
@@ -6790,7 +6790,7 @@ sub am_primary_prefixes ($$@)
{
my ($base, $dist, $X) = ($1 || '', $2 || '', $3 || '');
if ($dist ne '' && ! $can_dist)
- {
+ {
err_var ($var,
"invalid variable `$varname': `dist' is forbidden");
}
@@ -6994,7 +6994,7 @@ sub am_install_var
EXEC => $exec_p,
INSTALL => $install_p,
DIST => $dist_p,
- DISTVAR => $distvar,
+ DISTVAR => $distvar,
'CK-OPTS' => $check_options_p);
}
@@ -7713,20 +7713,20 @@ sub parse_arguments ()
my $cli_where = new Automake::Location;
my %cli_options =
(
- 'libdir=s' => \$libdir,
- 'gnu' => sub { set_strictness ('gnu'); },
- 'gnits' => sub { set_strictness ('gnits'); },
- 'cygnus' => sub { set_global_option ('cygnus', $cli_where); },
+ 'libdir=s' => \$libdir,
+ 'gnu' => sub { set_strictness ('gnu'); },
+ 'gnits' => sub { set_strictness ('gnits'); },
+ 'cygnus' => sub { set_global_option ('cygnus', $cli_where); },
'foreign' => sub { set_strictness ('foreign'); },
- 'include-deps' => sub { unset_global_option ('no-dependencies'); },
- 'i|ignore-deps' => sub { set_global_option ('no-dependencies',
+ 'include-deps' => sub { unset_global_option ('no-dependencies'); },
+ 'i|ignore-deps' => sub { set_global_option ('no-dependencies',
$cli_where); },
- 'no-force' => sub { $force_generation = 0; },
+ 'no-force' => sub { $force_generation = 0; },
'f|force-missing' => \$force_missing,
'o|output-dir=s' => \$output_directory,
- 'a|add-missing' => \$add_missing,
- 'c|copy' => \$copy_missing,
- 'v|verbose' => sub { setup_channel 'verb', silent => 0; },
+ 'a|add-missing' => \$add_missing,
+ 'c|copy' => \$copy_missing,
+ 'v|verbose' => sub { setup_channel 'verb', silent => 0; },
'W|warnings=s' => \&parse_warnings,
# These long options (--Werror and --Wno-error) for backward
# compatibility. Use -Werror and -Wno-error today.
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Automake branch, master, updated. Release-1-10-74-g1d0c65c,
Akim Demaille <=