* automake.in (handle_multilib): Register all-multi.

(file_contents_internal): Insert n when concatenating actions
from "factored" rules.
* lib/config-ml.in: New file, from GCC, including a patch
from Ralf Corsepius (see GCC's PR 11526).
* lib/symlink-tree.in: New file, from GCC.
* lib/Makefile.am (dist_script_DATA): Add config-ml.in and
symlink-tree.
* lib/am/clean.am (distclean-generic): Do not delete Makefile here...
(distclean, maintainer-clean): ... do it here.
* lib/am/depend.am (distclean-depend): Likewise, replace by
(distclean, maintainer-clean): ... these.
* lib/am/multilib.am (all-recursive, install-recursive,
mostlyclean-recursive, clean-recursive, distclean-recursive,
maintainer-clean-recursive): Remove these rules.
(mostlyclean-am, clean-am, distclean-am, maintainer-clean-am): Replace
by ...
(mostlyclean, clean, distclean, maintainer-clean): ... these.
(all-am): Remove, done in handle_multilib.
(install-am): Replace by ...
(install-exec-am): ... this.
* tests/Makefile.am (TESTS): Add multlib.test.
* tests/multlib.test: New file, based on a test case by
Ralf Corsepius

1 files changed, 11 insertions, 3 deletions

diff --git a/automake.in b/automake.in
index 98c264411..4fb66e8e4 100755
--- a/automake.in
+++ b/automake.in
@@ -3329,9 +3329,10 @@ sub handle_tags
 # Handle multilib support.
 sub handle_multilib
 {
-    if ($seen_multilib && $relative_dir eq '.')
+  if ($seen_multilib && $relative_dir eq '.')
     {
-	$output_rules .= &file_contents ('multilib', new Automake::Location);
+      $output_rules .= &file_contents ('multilib', new Automake::Location);
+      push (@all, 'all-multi');
     }
 }
 
@@ -6402,7 +6403,14 @@ sub file_contents_internal ($$$%)
 	      if (defined $dependencies{$_} && $cond != FALSE)
 		{
 		  &depend ($_, @deps);
-		  $actions{$_} .= $actions;
+		  if ($actions{$_})
+		    {
+		      $actions{$_} .= "\n$actions";
+		    }
+		  else
+		    {
+		      $actions{$_} = $actions;
+		    }
 		}
 	      else
 		{