(&add_depend2, &saw_sources_p): Adjust.
* depend2.am: `%EXT%' no longer includes the dot.
2001-04-27 Akim Demaille <akim@epita.fr>
+ * automake.in (&lang_extensions): Remove.
+ (&add_depend2, &saw_sources_p): Adjust.
+ * depend2.am: `%EXT%' no longer includes the dot.
+
+2001-04-27 Akim Demaille <akim@epita.fr>
+
* automake.in (&finish_languages, &handle_single_transform_list)
(&add_depend2, &handle_dependencies): No longer use the language
name in `$lang'. Rename `$lang_obj' as `$lang'.
-
2001-04-27 Akim Demaille <akim@epita.fr>
* automake.in (®ister_language): Use `new Language' with a hash.
'COMPILE' => $compile,
'LTCOMPILE' => $ltcompile);
- foreach my $ext (&lang_extensions ($lang->name))
+ foreach my $ext (grep ($extension_seen{$_}, @{$lang->extensions}))
{
$output_rules .= (&file_contents ('depend2',
(%transform,
}
}
-# A helper which computes a sorted list of all extensions for LANG.
-sub lang_extensions
-{
- my ($lang) = @_;
- my @r;
- foreach my $key (sort keys %extension_seen)
- {
- push (@r, '.' . $key) if $extension_map{$key} eq $lang;
- }
- return @r;
-}
# A helper which decides whether libtool is needed. Returns prefix
# for compiler and linker.
}
else
{
- my @exts = &lang_extensions ('header');
- $headers = @exts;
+ $headers = grep ($extension_seen{$_},
+ @{$languages{'header'}->extensions});
}
return scalar keys %extension_seen > $headers;
?GENERIC?%FPFX%DEPMODE = @%FPFX%DEPMODE@
endif %AMDEP%
-?GENERIC?%EXT%.o:
+?GENERIC?.%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
%COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
if %?LIBTOOL%
-?GENERIC?%EXT%.lo:
+?GENERIC?.%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
%LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
endif %?LIBTOOL%
-?GENERIC?%EXT%.obj:
+?GENERIC?.%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
?GENERIC?%FPFX%DEPMODE = @%FPFX%DEPMODE@
endif %AMDEP%
-?GENERIC?%EXT%.o:
+?GENERIC?.%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
%COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
if %?LIBTOOL%
-?GENERIC?%EXT%.lo:
+?GENERIC?.%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
%LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
endif %?LIBTOOL%
-?GENERIC?%EXT%.obj:
+?GENERIC?.%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@