From fa7c85e235c953ba25d8b1cde06005116c255b1d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 5 Apr 2017 19:59:12 +0100 Subject: [PATCH] build: Improve dependency for CLI/infrakit build Use vendor.conf as a proxy for ./vendor contents Signed-off-by: Rolf Neugebauer --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d41ca7112..8df6a3278 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ all: default GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a -MOBY_DEPS=$(wildcard src/cmd/moby/*.go) GOOS=$(shell uname -s | tr '[:upper:]' '[:lower:]') GOARCH=amd64 ifneq ($(GOOS),linux) @@ -14,11 +13,13 @@ ifeq ($(GOOS),darwin) default: bin/infrakit-instance-hyperkit endif +MOBY_DEPS=$(wildcard src/cmd/moby/*.go) Makefile vendor.conf +MOBY_DEPS+=$(wildcard src/initrd/*.go) $(wildcard src/pad4/*.go) bin/moby: $(MOBY_DEPS) | bin tar cf - vendor src/initrd src/pad4 -C src/cmd/moby . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby -o $@ | tar xf - touch $@ -INFRAKIT_DEPS=$(wildcard src/cmd/infrakit-instance-hyperkit/*.go) +INFRAKIT_DEPS=$(wildcard src/cmd/infrakit-instance-hyperkit/*.go) Makefile vendor.conf bin/infrakit-instance-hyperkit: $(INFRAKIT_DEPS) | bin tar cf - vendor -C src/cmd/infrakit-instance-hyperkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby -o $@ | tar xf - touch $@