From 239fed5bbdab41643af2d119107023ec3e0d8a3c Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 17 Mar 2011 15:26:16 -0700 Subject: gpxe: Make the build parallel-safe Make sure we don't have multiple build processes wrecking havoc in the gpxe directory. Signed-off-by: H. Peter Anvin --- gpxe/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gpxe/Makefile b/gpxe/Makefile index 7d100887..1fb6a958 100644 --- a/gpxe/Makefile +++ b/gpxe/Makefile @@ -19,6 +19,8 @@ TARGETS = gpxelinux.0 gpxelinuxk.0 +PXEMAKE = $(MAKE) -C src NO_WERROR=1 + all: $(TARGETS) tidy: @@ -33,16 +35,17 @@ spotless: clean dist installer: -src/bin/undionly.kkpxe: pxelinux.gpxe ../core/pxelinux.0 - $(MAKE) -C src bin/undionly.kkpxe NO_WERROR=1 \ - EMBEDDED_IMAGE=../pxelinux.gpxe,../../core/pxelinux.0 +src/bin/blib.a: + $(PXEMAKE) bin/blib.a + +src/bin/undionly.kkpxe: src/bin/blib.a pxelinux.gpxe ../core/pxelinux.0 + $(PXEMAKE) bin/undionly.kkpxe EMBEDDED_IMAGE=../pxelinux.gpxe,../../core/pxelinux.0 gpxelinux.0: src/bin/undionly.kkpxe cp -f $< $@ -src/bin/undionly.kpxe: pxelinuxk.gpxe ../core/pxelinux.0 - $(MAKE) -C src bin/undionly.kpxe NO_WERROR=1 \ - EMBEDDED_IMAGE=../pxelinuxk.gpxe,../../core/pxelinux.0 +src/bin/undionly.kpxe: src/bin/blib.a pxelinuxk.gpxe ../core/pxelinux.0 + $(PXEMAKE) bin/undionly.kpxe EMBEDDED_IMAGE=../pxelinuxk.gpxe,../../core/pxelinux.0 gpxelinuxk.0: src/bin/undionly.kpxe cp -f $< $@ -- cgit v1.2.1