From de73c36a8d87a4512a9baaa694e873d001f16063 Mon Sep 17 00:00:00 2001 From: Christoph Barbian Date: Mon, 10 Jul 2023 16:39:22 +0200 Subject: [PATCH] cleanup Makefile --- .gitignore | 2 +- Makefile | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 61b91af..a1549cb 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,4 @@ Dockerfile.cross # local stuff /.kubeconfig -/.local/ssl \ No newline at end of file +/.local/ssl diff --git a/Makefile b/Makefile index 7d5e26f..63b7aa0 100644 --- a/Makefile +++ b/Makefile @@ -163,28 +163,14 @@ $(ENVTEST): $(LOCALBIN) .PHONY: client-gen client-gen: $(CLIENT_GEN) ## Download client-gen $(CLIENT_GEN): $(LOCALBIN) - $(call go-install-tool,$(CLIENT_GEN),k8s.io/code-generator/cmd/client-gen@$(CODE_GENERATOR_VERSION)) + test -s $(LOCALBIN)/client-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/client-gen@$(CODE_GENERATOR_VERSION) .PHONY: informer-gen informer-gen: $(INFORMER_GEN) ## Download informer-gen $(INFORMER_GEN): $(LOCALBIN) - $(call go-install-tool,$(INFORMER_GEN),k8s.io/code-generator/cmd/informer-gen@$(CODE_GENERATOR_VERSION)) + test -s $(LOCALBIN)/informer-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/informer-gen@$(CODE_GENERATOR_VERSION) .PHONY: lister-gen lister-gen: $(LISTER_GEN) ## Download lister-gen $(LISTER_GEN): $(LOCALBIN) - $(call go-install-tool,$(LISTER_GEN),k8s.io/code-generator/cmd/lister-gen@$(CODE_GENERATOR_VERSION)) - -# go-install-tool will 'go install' any package $2 and install it to $1. -PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) -define go-install-tool -@[ -f $(1) ] || { \ -set -e ;\ -TMP_DIR=$$(mktemp -d) ;\ -cd $$TMP_DIR ;\ -go mod init tmp ;\ -echo "Downloading $(2)" ;\ -GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\ -rm -rf $$TMP_DIR ;\ -} -endef + test -s $(LOCALBIN)/lister-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/lister-gen@$(CODE_GENERATOR_VERSION)