* lib/am/multilib.am: Add $(MAKE) comments to multido and

multiclean lines, to enable parallel make.  Based on a patch
by Alexandre Oliva applied to newlib on 2003-10-15.

diff --git a/ChangeLog b/ChangeLog
index 3911da8247ab44da9428da9b1571b248e970fb7c..759a2d8a6e4f68bf9bd13640be4e0d485a897b03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-23  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/am/multilib.am: Add $(MAKE) comments to multido and
+       multiclean lines, to enable parallel make.  Based on a patch
+       by Alexandre Oliva applied to newlib on 2003-10-15.
+
 2004-05-22  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.in (scan_autoconf_traces): Trace for LT_SUPPORTED_TAG

diff --git a/lib/am/multilib.am b/lib/am/multilib.am
index a0d7b19ab818f6c28d2dd976a3c6b66c6f999927..e483a91867f8bab34d2bb5f299711dbb10993c95 100644 (file)
--- a/lib/am/multilib.am
+++ b/lib/am/multilib.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 2001, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1998, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -23,22 +23,26 @@ MULTISUBDIR =
 MULTIDO = true
 MULTICLEAN = true
 
+# GNU Make needs to see an explicit $(MAKE) variable in the command it
+# runs to enable its job server during parallel builds.  Hence the
+# comments below.
+
 all-multi:
-       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
 install-multi:
-       $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
+       $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
 
 .PHONY: all-multi install-multi
 
 
 mostlyclean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
 clean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
 distclean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
 maintainer-clean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
 
 .PHONY: mostlyclean-multi clean-multi distclean-multi maintainer-clean-multi