From 19b53cdeb1367edf5bb552bd22ac8b7d8c9420c2 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Fri, 8 Jan 2016 12:06:38 +0000 Subject: [PATCH] refactor: get rid of superfluous rule --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 14c5f774..ae1757f2 100644 --- a/Makefile +++ b/Makefile @@ -65,9 +65,9 @@ $(WEAVEUTIL_EXE): prog/weaveutil/*.go $(SIGPROXY_EXE): prog/sigproxy/*.go $(DOCKERPLUGIN_EXE): prog/plugin/*.go plugin/net/*.go plugin/ipam/*.go plugin/skel/*.go api/*.go common/docker/*.go $(TEST_TLS_EXE): test/tls/*.go +$(WEAVEWAIT_NOOP_EXE): prog/weavewait/*.go $(WEAVEWAIT_EXE): prog/weavewait/*.go net/*.go $(WEAVEWAIT_NOMCAST_EXE): prog/weavewait/*.go net/*.go -$(WEAVEWAIT_NOOP_EXE): prog/weavewait/*.go $(WEAVER_EXE) $(WEAVEPROXY_EXE): ifeq ($(COVERAGE),true) @@ -88,7 +88,7 @@ $(WEAVEUTIL_EXE): # These next programs need separate rules as they fail the netgo check in # the main build stanza due to not importing net package -$(SIGPROXY_EXE) $(DOCKERPLUGIN_EXE) $(TEST_TLS_EXE): +$(SIGPROXY_EXE) $(DOCKERPLUGIN_EXE) $(TEST_TLS_EXE) $(WEAVEWAIT_NOOP_EXE): go get -tags netgo ./$(@D) go build $(BUILD_FLAGS) -o $@ ./$(@D) @@ -100,9 +100,6 @@ $(WEAVEWAIT_NOMCAST_EXE): go get -tags netgo ./$(@D) go build $(BUILD_FLAGS) -tags "netgo iface" -o $@ ./$(@D) -$(WEAVEWAIT_NOOP_EXE): - go get -tags netgo ./$(@D) - go build $(BUILD_FLAGS) -o $@ ./$(@D) $(WEAVER_UPTODATE): prog/weaver/Dockerfile $(WEAVER_EXE) $(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker build -t $(WEAVER_IMAGE) prog/weaver