From 04f327f31c0c305adef889d646ecb8c9effbf801 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Mon, 7 Oct 2002 04:37:05 +0000 Subject: [PATCH] Makefile.am (all-multi): Fix multilib parallel build. boehm-gc: * Makefile.am (all-multi): Fix multilib parallel build. libf2c: * Makefile.in (all): Fix multilib parallel build. libffi: * Makefile.am (all-multi): Fix multilib parallel build. libiberty: * Makefile.in (all): Fix multilib parallel build. libjava: * Makefile.am (all-multi): Fix multilib parallel build. libobjc: * Makefile.in (all): Fix multilib parallel build. libstdc++-v3: * Makefile.am (all-multi): Fix multilib parallel build. zlib: * Makefile.am (all-multi): Fix multilib parallel build. From-SVN: r57874 --- boehm-gc/ChangeLog | 4 ++++ boehm-gc/Makefile.am | 2 +- boehm-gc/Makefile.in | 2 +- libf2c/ChangeLog | 4 ++++ libf2c/Makefile.in | 2 +- libffi/ChangeLog | 4 ++++ libffi/Makefile.am | 2 +- libffi/Makefile.in | 2 +- libiberty/ChangeLog | 4 ++++ libiberty/Makefile.in | 2 +- libjava/ChangeLog | 4 ++++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 2 +- libobjc/ChangeLog | 4 ++++ libobjc/Makefile.in | 2 +- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/Makefile.am | 2 +- libstdc++-v3/Makefile.in | 2 +- zlib/ChangeLog | 6 +++++- zlib/Makefile.am | 2 +- zlib/Makefile.in | 2 +- 21 files changed, 46 insertions(+), 14 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 57b511e62915..444343594a1f 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,7 @@ +2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-08-23 Adam Megacz * win32_threads.cc: Removed extraneous ABORT() diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index e9e1c6107c68..960cc606fbb5 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -144,7 +144,7 @@ distclean-am: distclean-multi maintainer-clean-am: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index c540de4d6f98..e49b9be24c03 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -616,7 +616,7 @@ distclean-am: distclean-multi maintainer-clean-am: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index 36048760c6b3..1119274a6b8e 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,7 @@ +Mon Oct 7 00:32:38 2002 Kaveh R. Ghazi + + * Makefile.in (all): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in index ef42e39d1a7f..8fb2fa76833b 100644 --- a/libf2c/Makefile.in +++ b/libf2c/Makefile.in @@ -121,7 +121,7 @@ F2CEXT = abort derf derfc ef1asc ef1cmc erf erfc exit getarg getenv iargc \ # the dependency) and then (perhaps) builds multilibs. all: all-unilib - $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="all-unilib" + : $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="all-unilib" # `all-unilib' is the overall target in the absence of multilibs, # meant to be invoked via multi-do for multilibs. diff --git a/libffi/ChangeLog b/libffi/ChangeLog index cba762b0a827..7becdda94b5e 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,7 @@ +2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 4d1120d100e1..8425dcfc5576 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -195,7 +195,7 @@ distclean-recursive: distclean-multi maintainer-clean-recursive: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/libffi/Makefile.in b/libffi/Makefile.in index 24f2930d85ed..cb24ac2b95cd 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -735,7 +735,7 @@ distclean-recursive: distclean-multi maintainer-clean-recursive: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 7654aab9cecb..5bc42dc7b1dc 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2002-10-07 Kaveh R. Ghazi + + * Makefile.in (all): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 5fa96302812f..a399d4edbe01 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -99,7 +99,7 @@ SUBDIRS = testsuite # FIXME: add @BUILD_INFO@ once we're sure it works for everyone. all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir - @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all + @: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all .PHONY: check installcheck check: check-subdir diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1dd98397083a..ee5a19fc0bd1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ea114792d994..082c66e3e853 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -1964,7 +1964,7 @@ distclean-recursive: distclean-multi maintainer-clean-recursive: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 747eec948f48..a604f9e787b0 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -3477,7 +3477,7 @@ distclean-recursive: distclean-multi maintainer-clean-recursive: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 9d64b825738b..01abbdcc29b0 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2002-10-07 Kaveh R. Ghazi + + * Makefile.in (all): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 2faf269f1011..45f8e2584d2d 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -136,7 +136,7 @@ FLAGS_TO_PASS = \ "tooldir=$(tooldir)" all: libobjc.la $(OBJC_BOEHM_GC) - $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all + : $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all # User-visible header files. diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5bee1bc9709d..9f9546dfd3e1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-10-01 Phil Edwards * Makefile.am (check-abi): Add @ to rule. diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index a05f27d530a4..d41247763457 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -108,7 +108,7 @@ distclean-am: distclean-multi maintainer-clean-am: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index a33b92242363..718150791b1d 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -494,7 +494,7 @@ distclean-am: distclean-multi maintainer-clean-am: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/zlib/ChangeLog b/zlib/ChangeLog index c13c3bcc81fb..bdedd963a36c 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,3 +1,7 @@ +2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. @@ -253,7 +257,7 @@ Changes in 1.0.6 (19 Jan 1998) - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) - added makelcc.bat for lcc-win32 (Tom St Denis) - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) -- Avoid expanded $Id: ChangeLog,v 1.2.16.5 2002/07/25 23:40:29 mmitchel Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. +- Avoid expanded $Id: ChangeLog,v 1.2.16.5.2.1 2002/08/14 09:01:14 mmitchel Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. - check for unistd.h in configure (for off_t) - remove useless check parameter in inflate_blocks_free - avoid useless assignment of s->check to itself in inflate_blocks_new diff --git a/zlib/Makefile.am b/zlib/Makefile.am index ee8288f9678f..46ac3de4ec97 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -85,7 +85,7 @@ distclean-am: distclean-multi maintainer-clean-am: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff --git a/zlib/Makefile.in b/zlib/Makefile.in index e8d7fc966370..0a75b98dc690 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -480,7 +480,7 @@ distclean-am: distclean-multi maintainer-clean-am: maintainer-clean-multi all-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do + : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: -- 2.47.2