From 18f6d3cd152d0017ba9e218e2bf388e0d5bba8b4 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Mon, 24 Apr 2017 12:16:44 -0500 Subject: [PATCH] Separate `go generate` make targets, remove generate from test requirements --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2c8fd4fa5..cd3add926 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ glide.lock: glide glide.yaml vendor-update: glide.lock -test: vendor generate +test: vendor go test $(shell cd $(GOPATH)/src/$(CLONE_URL); go list ./... | grep -v vendor) pilosa: vendor @@ -42,14 +42,19 @@ install: vendor .protoc-gen-gofast: vendor ifndef PROTOC - $(error "protoc is not available please install protoc from https://github.com/google/protobuf/releases") + $(error "protoc is not available. please install protoc from https://github.com/google/protobuf/releases") endif go build -o .protoc-gen-gofast ./vendor/github.com/gogo/protobuf/protoc-gen-gofast cp ./.protoc-gen-gofast $(GOPATH)/bin/protoc-gen-gofast -generate: .protoc-gen-gofast statik +generate-protoc: .protoc-gen-gofast go generate github.com/pilosa/pilosa/internal +generate-statik: statik + go generate github.com/pilosa/pilosa/handler + +generate: generate-protoc generate-statik + statik: ifndef STATIK go install github.com/rakyll/statik