RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 09:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #793 from prometheus/fabxc/make

Browse Source 
make: do not call go-bindata on building.
This commit is contained in:
Fabian Reinartz 2015-06-12 15:21:55 +02:00
commit 3ec2e2323d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

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

2
web/Makefile
View File

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