Separate go generate make targets, remove generate from test requirements

This commit is contained in:
Cody Soyland 2017-04-24 12:16:44 -05:00
parent 3db8b02865
commit 18f6d3cd15

View file

@ -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