From: Akim Demaille <akim@epita.fr>
Date: Fri, 27 Apr 2001 12:55:48 +0000 (+0000)
Subject: * automake.in (&lang_extensions): Remove.
X-Git-Tag: handle-languages~44
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=be70c7fdd6b0fa88f547bb5b1b2ed10589551045;p=automake.git

* automake.in (&lang_extensions): Remove.
(&add_depend2, &saw_sources_p): Adjust.
* depend2.am: `%EXT%' no longer includes the dot.
---

diff --git a/ChangeLog b/ChangeLog
index fc84e30c..89413636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+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 (&register_language): Use `new Language' with a hash.
diff --git a/automake.in b/automake.in
index b4188461..eca585be 100755
--- a/automake.in
+++ b/automake.in
@@ -3148,7 +3148,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,
@@ -5233,17 +5233,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.
@@ -5297,8 +5286,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;
diff --git a/depend2.am b/depend2.am
index 4d412a96..8ae4dfd8 100644
--- a/depend2.am
+++ b/depend2.am
@@ -28,7 +28,7 @@ if %AMDEP%
 ?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 @@ endif %AMDEP%
 	%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 @@ endif  %AMDEP%
 	%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@
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 4d412a96..8ae4dfd8 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -28,7 +28,7 @@ if %AMDEP%
 ?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 @@ endif %AMDEP%
 	%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 @@ endif  %AMDEP%
 	%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@