From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 23 May 2004 09:49:13 +0000 (+0000)
Subject: * lib/am/multilib.am: Add $(MAKE) comments to multido and
X-Git-Tag: Release-1-8b~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eab8f52b096461ee39f5797e413688bc401fca8;p=thirdparty%2Fautomake.git

* 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 3911da824..759a2d8a6 100644
--- 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 a0d7b19ab..e483a9186 100644
--- 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