Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
extension together.
* automake.in (&handle_languages): Group code to be run once per
Index: automake.in
--- automake.in Thu, 29 Mar 2001 02:33:12 +0200 akim (am/f/39_automake.i 1.234 755)
+++ automake.in Thu, 29 Mar 2001 02:36:10 +0200 akim (am/f/39_automake.i 1.234 755)
@@ -1373,6 +1373,27 @@ sub handle_languages
{
$comp = $lang->compile
}
+
+ my $compile = '$(' . $pfx . 'COMPILE)';
+ my $ltcompile = '$(LT' . $pfx . 'COMPILE)';
+ my %transform = (%transform,
+ 'GENERIC' => 1,
+ 'BASE' => '$*',
+ 'SOURCE' => '$<',
+ 'OBJ' => '$@',
+ 'LTOBJ' => '$@',
+ 'OBJOBJ' => '$@',
+ 'COMPILE' => $compile,
+ 'LTCOMPILE' => $ltcompile);
+
+ foreach my $ext (grep ($extension_seen{$_},
+ @{$lang->extensions}))
+ {
+ $output_rules .= (&file_contents ('depend2',
+ (%transform,
+ 'EXT' => $ext))
+ . "\n");
+ }
}
elsif (defined $lang->compile)
{
@@ -1437,32 +1458,6 @@ sub handle_languages
next if defined $done{$lang};
$done{$lang} = 1;
- # This function can be called even when we don't want dependency
- # tracking. This happens when we need an explicit rule for some
- # target. In this case we don't want to include the generic code.
- if ($lang->autodep ne 'no' && $use_dependencies)
- {
- my $compile = '$(' . $pfx . 'COMPILE)';
- my $ltcompile = '$(LT' . $pfx . 'COMPILE)';
- my %transform = (%transform,
- 'GENERIC' => 1,
- 'BASE' => '$*',
- 'SOURCE' => '$<',
- 'OBJ' => '$@',
- 'LTOBJ' => '$@',
- 'OBJOBJ' => '$@',
- 'COMPILE' => $compile,
- 'LTCOMPILE' => $ltcompile);
-
- foreach my $ext (grep ($extension_seen{$_},
- @{$lang->extensions}))
- {
- $output_rules .= (&file_contents ('depend2',
- (%transform,
- 'EXT' => $ext))
- . "\n");
- }
- }
# If the source to a program consists entirely of code from a
# `pure' language, for instance C++ for Fortran 77, then we
