From 8dc5ae662a4aaf6d485bdf5e21b4a2aca6b08cac Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 28 May 2015 17:16:22 +0100 Subject: [PATCH] simplify dependencies This isn't as precise, but these common dependencies rarely change. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 54a70955..b2df6efd 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ travis: $(EXES) update: $(EXES) go get -u -f -v -tags -netgo $(addprefix ./,$(dir $(EXES))) -$(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE): common/*.go +$(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE): common/*.go common/*/*.go net/*.go go get -tags netgo ./$(@D) go build -ldflags "-extldflags \"-static\" -X main.version $(WEAVE_VERSION)" -tags netgo -o $@ ./$(@D) @strings $@ | grep cgo_stub\\\.go >/dev/null || { \ @@ -52,10 +52,10 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE): common/*.go false; \ } -$(WEAVER_EXE): router/*.go ipam/*.go ipam/*/*.go common/*.go common/*/*.go net/*.go weaver/main.go -$(WEAVEDNS_EXE): nameserver/*.go common/*.go common/*/*.go net/*.go weavedns/main.go -$(WEAVEPROXY_EXE): proxy/*.go common/*.go weaveproxy/main.go -$(WEAVEWAIT_EXE): weavewait/*.go net/*.go weavewait/main.go +$(WEAVER_EXE): router/*.go ipam/*.go ipam/*/*.go weaver/main.go +$(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go +$(WEAVEPROXY_EXE): proxy/*.go weaveproxy/main.go +$(WEAVEWAIT_EXE): weavewait/*.go weavewait/main.go # Sigproxy needs separate rule as it fails the netgo check in the main # build stanza due to not importing net package