From 8cbdfebc4f7cb338f618d0a64907db51d73b7529 Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Thu, 29 Nov 2018 12:38:23 +0100 Subject: [PATCH] Makefile: Fix parallel build (2nd try) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 851f685993ce ("Makefile: Add dependency between libvmcp and libutil to fix -j builds") introduced the following regression $ make clean CLEAN /home2/holzheu/src/s390-tools ... CLEAN libccw CC libutil/util_base.o CC libutil/util_path.o For the "clean" target the new library dependency triggers a build of libutil. So remove the dependency again. To fix the parallel build issue, no longer build the examples with "make all" and add a new target "examples" that can now be used for building the example programs. Fixes: 851f685993ce ("Makefile: Add dependency between libvmcp and libutil to fix -j builds") Signed-off-by: Michael Holzheu Signed-off-by: Jan Höppner --- common.mak | 3 --- libutil/Makefile | 3 ++- libvmcp/Makefile | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common.mak b/common.mak index 77095d74..1e8d8444 100644 --- a/common.mak +++ b/common.mak @@ -343,9 +343,6 @@ $(rootdir)/libvmcp/libvmcp.a: $(rootdir)/libvmcp $(MAKE) -C $(rootdir)/libvmcp/ libvmcp.a .PHONY: $(rootdir)/libvmcp -# Dependencies between libraries -$(rootdir)/libvmcp: $(rootdir)/libutil/libutil.a - $(rootdir)/zipl/boot/data.o: $(MAKE) -C $(rootdir)/zipl/boot/ data.o diff --git a/libutil/Makefile b/libutil/Makefile index fd5e2138..ca90f2a4 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -13,7 +13,8 @@ examples = util_base_example \ util_prg_example \ util_rec_example -all: $(lib) $(examples) +all: $(lib) +examples: $(lib) $(examples) objects = util_base.o \ util_path.o \ diff --git a/libvmcp/Makefile b/libvmcp/Makefile index 88cdb31b..9f343cf6 100644 --- a/libvmcp/Makefile +++ b/libvmcp/Makefile @@ -4,7 +4,8 @@ lib = libvmcp.a examples = vmcp_example -all: $(lib) $(examples) +all: $(lib) +examples: $(lib) $(examples) objects = vmcp.o