Improve Makefile for clientset and gen bins (#1079)

* Improve Makefile for clientset and gen bins

Signed-off-by: Vince Prignano <[email protected]>

* use bazel clean

Signed-off-by: Vince Prignano <[email protected]>

Makefile

@@ -62,6 +62,9 @@ manager: lint-full ## Build manager binary
 clusterctl: lint-full ## Build clusterctl binary
 	go build -o bin/clusterctl sigs.k8s.io/cluster-api/cmd/clusterctl
 
+bin/%-gen: ./vendor/k8s.io/code-generator/cmd/%-gen ## Build code-generator binaries
+	go build -o $@ ./$<
+
 .PHONY: run
 run: lint ## Run against the configured Kubernetes cluster in ~/.kube/config
 	go run ./cmd/manager/main.go
@@ -97,19 +100,18 @@ generate-go: ## Runs go generate
 	go generate ./pkg/... ./cmd/...
 
 .PHONY: generate-clientset
-generate-clientset: ## Generate a typed clientset
-	rm -rf pkg/client
-	go run ./vendor/k8s.io/code-generator/cmd/client-gen/main.go \
+generate-clientset: clean-clientset bin/client-gen bin/lister-gen bin/informer-gen ## Generate a typed clientset
+	bin/client-gen \
 		--clientset-name clientset \
 		--input-base sigs.k8s.io/cluster-api/pkg/apis \
 		--input deprecated/v1alpha1,cluster/v1alpha2 \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-	go run ./vendor/k8s.io/code-generator/cmd/lister-gen/main.go \
+	bin/lister-gen \
 		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-	go run ./vendor/k8s.io/code-generator/cmd/informer-gen/main.go \
+	bin/informer-gen \
 		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
 		--versioned-clientset-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset \
 		--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
@@ -190,7 +192,20 @@ docker-push-manifest: ## Push the fat manifest docker image. TODO: Update bazel
 
 .PHONY: clean
 clean: ## Remove all generated files
-	rm -f bazel-*
+	$(MAKE) clean-bazel
+	$(MAKE) clean-bin
+
+.PHONY: clean-bazel
+clean-bazel: ## Remove all generated bazel symlinks
+	bazel clean
+
+.PHONY: clean-bin
+clean-bin: ## Remove all generated binaries
+	rm -rf bin
+
+.PHONY: clean-clientset
+clean-clientset: ## Remove all generated clientset files
+	rm -rf pkg/client
 
 .PHONY: verify
 verify: