From 3fbe891b673dc84e4660a4cc3046c2ba922c559f Mon Sep 17 00:00:00 2001 From: Morgan Bauer Date: Fri, 1 Sep 2017 16:53:24 -0700 Subject: [PATCH] use standard build --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8dbf4ca95bc..ba11869f5ad 100644 --- a/Makefile +++ b/Makefile @@ -408,15 +408,16 @@ release-push-%: ###################### PLUGIN_EXES=bind-service create-service-broker create-service-instance -plugins: $(BINDIR)/bind-service/bind-service \ - $(BINDIR)/create-service-broker/create-service-broker \ - $(BINDIR)/create-service-instance/create-service-instance +plugins: .init .generate_files \ + $(BINDIR)/bind-service/bind-service \ + $(BINDIR)/create-service-broker/create-service-broker \ + $(BINDIR)/create-service-instance/create-service-instance $(BINDIR)/bind-service/bind-service: \ plugin/cmd/kubectl/bind-service/bind-service.go \ plugin/cmd/kubectl/bind-service/plugin.yaml rm -rf $(BINDIR)/bind-service - $(DOCKER_CMD) go build -o $@ $< + $(DOCKER_CMD) $(GO_BUILD) -o $@ $< $(DOCKER_CMD) cp plugin/cmd/kubectl/bind-service/*yaml \ $(BINDIR)/bind-service/ @@ -424,7 +425,7 @@ $(BINDIR)/create-service-broker/create-service-broker: \ plugin/cmd/kubectl/create-service-broker/create-service-broker.go \ plugin/cmd/kubectl/create-service-broker/plugin.yaml rm -rf $(BINDIR)/create-service-broker - $(DOCKER_CMD) go build -o $@ $< + $(DOCKER_CMD) $(GO_BUILD) -o $@ $< $(DOCKER_CMD) cp plugin/cmd/kubectl/create-service-broker/*yaml \ $(BINDIR)/create-service-broker/ @@ -432,7 +433,7 @@ $(BINDIR)/create-service-instance/create-service-instance: \ plugin/cmd/kubectl/create-service-instance/create-service-instance.go \ plugin/cmd/kubectl/create-service-instance/plugin.yaml rm -rf $(BINDIR)/create-service-instance - $(DOCKER_CMD) go build -o $@ $< + $(DOCKER_CMD) $(GO_BUILD) -o $@ $< $(DOCKER_CMD) cp plugin/cmd/kubectl/create-service-instance/*yaml \ $(BINDIR)/create-service-instance/