From 6c5d742e3be61de1ca904b2bb71e416bafd72430 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Mon, 23 Sep 2002 03:52:55 +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: r57423 --- 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.gcj | 4 ++++ zlib/Makefile.am | 2 +- zlib/Makefile.in | 2 +- 21 files changed, 45 insertions(+), 13 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 099e25adc90..6b5ac5b3dbd 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,7 @@ +2002-09-22 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-07-18 Bo Thorsen * include/private/gcconfig.h: Add x86-64 definitions. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index e9e1c6107c6..960cc606fbb 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 72eaa74fb89..ab8a7d1c915 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -571,7 +571,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 87ce8282369..83aa4da652e 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,7 @@ +Sun Sep 22 23:43:37 2002 Kaveh R. Ghazi + + * Makefile.in (all): Fix multilib parallel build. + 2002-09-14 Tim Prince PR libf2c/7384 diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in index c6fa9ad52ce..5806a0b9594 100644 --- a/libf2c/Makefile.in +++ b/libf2c/Makefile.in @@ -124,7 +124,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 b6ed2cee779..da2b67b0a40 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,7 @@ +2002-09-22 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-07-19 Kaz Kojima * configure.in (sh[34]*-*-linux*): Add brackets. diff --git a/libffi/Makefile.am b/libffi/Makefile.am index cafeab71e3a..9ee70acc02f 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -218,7 +218,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 47d1353b2c2..37adbf795a4 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -773,7 +773,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 efed5c66dbb..ad8d0e4c694 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2002-09-22 Kaveh R. Ghazi + + * Makefile.in (all): Fix multilib parallel build. + 2002-09-19 John David Anglin * cp-demangle.c (demangling_new): Cast 0 to enum. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 5a25987d58b..e0bb15a7519 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -105,7 +105,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 7f50578f476..aadd1516abc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2002-09-22 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-09-21 Michael Koch * java/net/Socket.java diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 456662ce4fc..fbffae41829 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2430,7 +2430,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 272a4460098..686b0f0c763 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -4310,7 +4310,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 cd72694f810..dd1bc296408 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2002-09-22 Kaveh R. Ghazi + + * Makefile.in (all): Fix multilib parallel build. + Thu Sep 12 12:44:37 2002 Nicola Pero * sendmsg.c (nil_method): Declare not to take a variable number of diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 47aa535372f..4d5c5da8db4 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -137,7 +137,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 7a5741bec99..c762299da15 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2002-09-22 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-09-22 Richard Henderson * include/std/std_limits.h (__glibcpp_f32_round_error, diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 410aa5549a7..c8c1df1d6ed 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -110,7 +110,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 3853df97b4d..90b80b5fbbd 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -536,7 +536,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.gcj b/zlib/ChangeLog.gcj index 91bfa665d80..f146d17bf52 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,7 @@ +2002-09-22 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-05-16 Rainer Orth * configure.in: Allow for PWDCMD to override hardcoded pwd. diff --git a/zlib/Makefile.am b/zlib/Makefile.am index ee8288f9678..46ac3de4ec9 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 775af17c9f9..59d8ff76e68 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -483,7 +483,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: