From: Egbert Eich Date: Sun Feb 10 17:16:51 2019 +0100 Subject: Makefiles: Serialize libseq, libplat, mommond_mod for parallel builds Patch-mainline: Not yet Git-commit: d8e18ae193f2fd67761c8226a3ad9bcf80d4230c References: Signed-off-by: Egbert Eich --- Makefile | 17 ++++++++++------- src/Makefile | 10 ++++++---- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 4636e85..489753b 100644 --- a/Makefile +++ b/Makefile @@ -9,18 +9,18 @@ default: dexamples .PHONY: default alllib all c z s d \ sexamples dexamples cexamples zexamples multi_example \ - mumps_lib requiredobj libseqneeded clean + mumps_lib common requiredobj libseqneeded clean alllib: c z s d all: cexamples zexamples sexamples dexamples multi_example -c: +c: requiredobj $(MAKE) ARITH=c mumps_lib -z: +z: requiredobj $(MAKE) ARITH=z mumps_lib -s: +s: requiredobj $(MAKE) ARITH=s mumps_lib -d: +d: requiredobj $(MAKE) ARITH=d mumps_lib @@ -36,7 +36,10 @@ Makefile.inc: include Makefile.inc -mumps_lib: requiredobj +common: + (cd src ; $(MAKE) common) + +mumps_lib: (cd src ; $(MAKE) $(ARITH)) cexamples: c @@ -54,7 +57,7 @@ dexamples: d multi_example: s d c z (cd examples ; $(MAKE) multi) -requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) +requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) common # dummy MPI library (sequential version) diff --git a/src/Makefile b/src/Makefile index 88fc032..5a3c6e2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,13 +12,13 @@ default: d .PHONY: default s d c z mumps_lib clean -s: +s: common $(MAKE) ARITH=s mumps_lib -d: +d: common $(MAKE) ARITH=d mumps_lib -c: +c: common $(MAKE) ARITH=c mumps_lib -z: +z: common $(MAKE) ARITH=z mumps_lib include $(topdir)/Makefile.inc @@ -78,6 +78,8 @@ tools_common.o \ sol_common.o +common: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) + OBJS_MOD = \ $(ARITH)ana_aux.o \ $(ARITH)ana_aux_par.o \