From 5ae109fc2335b52f5d29cf38cf51aacbccf2f2fc Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 10 Sep 2016 20:40:16 +0100 Subject: [PATCH] build packages in parallel Signed-off-by: Justin Cormack --- alpine/Makefile | 2 +- alpine/packages/Makefile | 29 ++++++++--------------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/alpine/Makefile b/alpine/Makefile index 1a10603a4..daa853b9b 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -5,7 +5,7 @@ ETCFILES+=etc/inittab etc/fstab initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) rm -f initrd.img - $(MAKE) -C packages + $(MAKE) -j -C packages $(MAKE) -C kernel docker build -t moby-initrd:build . docker run --net=none --rm moby-initrd:build /bin/mkinitrd.sh > $@ diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile index 49339542b..4af716eca 100644 --- a/alpine/packages/Makefile +++ b/alpine/packages/Makefile @@ -1,23 +1,10 @@ -all: - $(MAKE) -C proxy - $(MAKE) -C diagnostics - $(MAKE) -C transfused - $(MAKE) -C tap-vsockd - $(MAKE) -C hvtools - $(MAKE) -C docker - $(MAKE) -C nc-vsock - $(MAKE) -C vsudd - $(MAKE) -C 9pmount-vsock - $(MAKE) -C iptables +DEPS=proxy diagnostics transfused tap-vsockd hvtools docker nc-vsock vsudd 9pmount-vsock iptables +.PHONY: clean $(DEPS) + +default: $(DEPS) + +$(DEPS): + $(MAKE) -C $@ clean: - $(MAKE) -C proxy clean - $(MAKE) -C diagnostics clean - $(MAKE) -C transfused clean - $(MAKE) -C tap-vsockd clean - $(MAKE) -C docker clean - $(MAKE) -C hvtools clean - $(MAKE) -C nc-vsock clean - $(MAKE) -C vsudd clean - $(MAKE) -C 9pmount-vsock clean - $(MAKE) -C iptables clean + for f in $(DEPS); do $(MAKE) -C $$f clean; done