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.
'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' => "\$",
# 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
# 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));
'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)',
'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)',
}
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))
}
# seems safest.
$output_rules .= "\n";
foreach my $iter (@deplist)
- {
+ {
$output_rules .= (subst ('AMDEP_TRUE')
. subst ('am__include')
. ' '
{
$_ = shift @files;
- # Configure substitutions in _SOURCES variables are errors.
- if (/^\@.*\@$/)
- {
+ # Configure substitutions in _SOURCES variables are errors.
+ if (/^\@.*\@$/)
+ {
my $parent_msg = '';
$parent_msg = "\nand is referred to from `$topparent'"
if $topparent ne $var->name;
. $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).
# 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;
}
}
- # 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;
}
$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
# 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')
# 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
# (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}},
[@specifics, %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}
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";
}
$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;
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,
{
return ();
},
- skip_ac_subst => 1);
+ skip_ac_subst => 1);
}
foreach my $pair (@liblist)
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/;
}
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'
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;
}
'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);
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;
}
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;
}
# 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'));
}
}
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;
}
}
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,
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,
}
}
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.
if ($suffix eq 'f90' || $suffix eq 'f95');
}
elsif ($macro eq 'AC_INIT')
- {
+ {
if (defined $args[2])
{
$package_version = $args[2];
}
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')
{
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" .
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;
|| $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
}
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')
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
# 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
# If ansi2knr fails then we shouldn't
# create the _.c file
. " || rm -f \$\@\n");
- 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
# 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)');
}
}
foreach my $ext (@{$lang->extensions})
{
$r += $extension_seen{$ext}
- if defined $extension_seen{$ext};
+ if defined $extension_seen{$ext};
}
}
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',
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'";
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;
}
while ($_ = $am_file->getline)
{
- $where->set ("$amfile:$.");
+ $where->set ("$amfile:$.");
if (/$IGNORE_PATTERN/o)
{
# Merely delete comments beginning with two hashes.
# 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;
$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)
$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,
# (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
$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;
}
$saw_bk = $new_saw_bk;
- $_ = $am_file->getline;
+ $_ = $am_file->getline;
}
$output_trailer .= $comment;
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;
$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);
}
$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
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;
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 `@SET-MAKE@',
# 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 ?
{
my ($base, $dist, $X) = ($1 || '', $2 || '', $3 || '');
if ($dist ne '' && ! $can_dist)
- {
+ {
err_var ($var,
"invalid variable `$varname': `dist' is forbidden");
}
EXEC => $exec_p,
INSTALL => $install_p,
DIST => $dist_p,
- DISTVAR => $distvar,
+ DISTVAR => $distvar,
'CK-OPTS' => $check_options_p);
}
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.
projects / platform / upstream / automake.git / commitdiff