From 8d304d95e57d41ddb2b97c8de843273dec01d86d Mon Sep 17 00:00:00 2001 From: Fabian Reinartz Date: Fri, 12 Jun 2015 00:00:54 +0200 Subject: [PATCH] make: do not call go-bindata on building. --- Makefile | 6 +++--- web/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e85e217738..65f7d44128 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ advice: $(GOCC) binary: build -build: tools web $(GOPATH) +build: tools $(GOPATH) $(GO) build -o prometheus $(BUILDFLAGS) . docker: build @@ -49,7 +49,7 @@ tag: $(BUILD_PATH)/cache/$(GOPKG): $(CURL) -o $@ -L $(GOURL)/$(GOPKG) -benchmark: dependencies tools web +benchmark: dependencies tools $(GO) test $(GO_TEST_FLAGS) -test.run='NONE' -test.bench='.*' -test.benchmem ./... | tee benchmark.txt clean: @@ -84,7 +84,7 @@ race_condition_run: race_condition_binary search_index: godoc -index -write_index -index_files='search_index' -test: dependencies tools web +test: dependencies tools $(GO) test $(GO_TEST_FLAGS) ./... tools: dependencies diff --git a/web/Makefile b/web/Makefile index cb26654b1e..8928ef0d33 100644 --- a/web/Makefile +++ b/web/Makefile @@ -21,6 +21,6 @@ blob/files.go: go-bindata $(shell find blob/templates/ blob/static/ -type f) $(GO) generate ./blob go-bindata: - $(GO) get -u github.com/jteeuwen/go-bindata/... + $(GO) get github.com/jteeuwen/go-bindata/... .PHONY: go-bindata