From 8f01f6e85ccdb5ab0a449c3e7601b18749265d3a Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 30 Dec 2015 23:14:53 +0000 Subject: [PATCH] make some rules more generic, depending on *.go instead of main.go --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 15e79707..29190932 100644 --- a/Makefile +++ b/Makefile @@ -76,12 +76,12 @@ $(NETCHECK_EXE): common/*.go common/*/*.go net/*.go $(NETGO_CHECK) $(WEAVER_EXE): router/*.go mesh/*.go ipam/*.go ipam/*/*.go nameserver/*.go prog/weaver/*.go -$(WEAVEPROXY_EXE): proxy/*.go prog/weaveproxy/main.go -$(NETCHECK_EXE): prog/netcheck/netcheck.go +$(WEAVEPROXY_EXE): proxy/*.go prog/weaveproxy/*.go +$(NETCHECK_EXE): prog/netcheck/*.go # 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): prog/sigproxy/main.go +$(SIGPROXY_EXE): prog/sigproxy/*.go $(DOCKERTLSARGS_EXE): prog/docker_tls_args/*.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