Switch config to YAML format.

synweap15 · May 7, 2015 · 5fbde88 · 5fbde88
1 parent 66ecc42
commit 5fbde88
Show file tree

Hide file tree

Showing 32 changed files with 669 additions and 1,276 deletions.
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname.go
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ advice: $(GOCC)
 
 binary: build
 
-build: config tools web $(GOPATH)
+build: tools web $(GOPATH)
 	$(GO) build -o prometheus $(BUILDFLAGS) .
 
 docker: build
@@ -49,7 +49,7 @@ tag:
 $(BUILD_PATH)/cache/$(GOPKG):
 	$(CURL) -o $@ -L $(GOURL)/$(GOPKG)
 
-benchmark: config dependencies tools web
+benchmark: dependencies tools web
 	$(GO) test $(GO_TEST_FLAGS) -test.run='NONE' -test.bench='.*' -test.benchmem ./... | tee benchmark.txt
 
 clean:
@@ -62,9 +62,6 @@ clean:
 	-find . -type f -name '*#' -exec rm '{}' ';'
 	-find . -type f -name '.#*' -exec rm '{}' ';'
 
-config:
-	$(MAKE) -C config
-
 $(SELFLINK): $(GOPATH)
 	ln -s $(MAKEFILE_DIR) $@
 
@@ -91,7 +88,7 @@ run: binary
 search_index:
 	godoc -index -write_index -index_files='search_index'
 
-test: config dependencies tools web
+test: dependencies tools web
 	$(GO) test $(GO_TEST_FLAGS) ./...
 
 tools: dependencies
@@ -103,4 +100,4 @@ web: dependencies
 rules: dependencies
 	$(MAKE) -C rules
 
-.PHONY: advice binary build clean config dependencies documentation format race_condition_binary race_condition_run release run search_index tag tarball test tools
+.PHONY: advice binary build clean dependencies documentation format race_condition_binary race_condition_run release run search_index tag tarball test tools
diff --git a/config/Makefile b/config/Makefile