[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
87-lang-extenions.patch
From: |
Akim Demaille |
Subject: |
87-lang-extenions.patch |
Date: |
Wed, 28 Mar 2001 09:28:09 +0200 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&lang_extensions): Remove.
(&add_depend2, &saw_sources_p): Adjust.
* depend2.am: `%EXT%' no longer includes the dot.
Index: automake.in
--- automake.in Sun, 25 Mar 2001 17:37:00 +0200 akim (am/f/39_automake.i 1.213
755)
+++ automake.in Sun, 25 Mar 2001 17:57:01 +0200 akim (am/f/39_automake.i 1.213
755)
@@ -3060,7 +3060,7 @@ sub add_depend2
'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,
@@ -5144,17 +5144,6 @@ sub lang_java_finish
}
}
-# 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.
@@ -5208,8 +5197,8 @@ sub saw_sources_p
}
else
{
- my @exts = &lang_extensions ('header');
- $headers = @exts;
+ $headers = grep ($extension_seen{$_},
+ @{$languages{'header'}->extensions});
}
return scalar keys %extension_seen > $headers;
Index: depend2.am
--- depend2.am Wed, 14 Mar 2001 23:12:52 +0100 akim (am/g/43_depend2.am 1.10
644)
+++ depend2.am Sun, 25 Mar 2001 17:54:34 +0200 akim (am/g/43_depend2.am 1.10
644)
@@ -28,7 +28,7 @@
?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@
@@ -38,7 +38,7 @@
%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@
@@ -48,7 +48,7 @@
%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@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 87-lang-extenions.patch,
Akim Demaille <=