Add Makefile.common (#940)

* Add Makefile.common

Signed-off-by: bege13mot <bege13mot@gmail.com>

* Change Makefile.common to initial Prometheus common

Signed-off-by: bege13mot <bege13mot@gmail.com>

* fix checkmetrics

Signed-off-by: bege13mot <bege13mot@gmail.com>

* fix promu

Signed-off-by: bege13mot <bege13mot@gmail.com>

* Add test to common

Signed-off-by: bege13mot <bege13mot@gmail.com>

* Fix GOPATH

Signed-off-by: bege13mot <bege13mot@gmail.com>

* Initial Makefile.common

Signed-off-by: bege13mot <bege13mot@gmail.com>

* original Makefile.common

Signed-off-by: bege13mot <bege13mot@gmail.com>

* delete promu

Signed-off-by: bege13mot <bege13mot@gmail.com>

* delete redundant .PRONY params

Signed-off-by: bege13mot <bege13mot@gmail.com>

1 files changed, 6 insertions, 42 deletions

diff --git a/Makefile b/Makefile
index 031698e..a254ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,20 +11,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include Makefile.common
+
 GO     ?= GO15VENDOREXPERIMENT=1 go
-GOPATH := $(firstword $(subst :, ,$(shell $(GO) env GOPATH)))
 GOARCH := $(shell $(GO) env GOARCH)
 GOHOSTARCH := $(shell $(GO) env GOHOSTARCH)
 
-PROMTOOL    ?= $(GOPATH)/bin/promtool
-PROMU       ?= $(GOPATH)/bin/promu
-STATICCHECK ?= $(GOPATH)/bin/staticcheck
-pkgs         = $(shell $(GO) list ./... | grep -v /vendor/)
+PROMTOOL    ?= $(FIRST_GOPATH)/bin/promtool
 
-PREFIX                  ?= $(shell pwd)
-BIN_DIR                 ?= $(shell pwd)
 DOCKER_IMAGE_NAME       ?= node-exporter
-DOCKER_IMAGE_TAG        ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
 MACH                    ?= $(shell uname -m)
 DOCKERFILE              ?= Dockerfile
 
@@ -75,10 +70,6 @@ $(eval $(call goarch_pair,mips64el,mipsel))
 
 all: style vet staticcheck checkmetrics build test $(cross-test) $(test-e2e)
 
-style:
-        @echo ">> checking code style"
-        @! gofmt -d $(shell find . -path ./vendor -prune -o -name '*.go' -print) | grep '^'
-
 test: collector/fixtures/sys/.unpacked
         @echo ">> running tests"
         $(GO) test -short $(test-flags) $(pkgs)
@@ -107,26 +98,6 @@ checkmetrics: $(PROMTOOL)
         @echo ">> checking metrics for correctness"
         ./checkmetrics.sh $(PROMTOOL) $(e2e-out)
 
-format:
-        @echo ">> formatting code"
-        @$(GO) fmt $(pkgs)
-
-vet:
-        @echo ">> vetting code"
-        @$(GO) vet $(pkgs)
-
-staticcheck: $(STATICCHECK)
-        @echo ">> running staticcheck"
-        @$(STATICCHECK) -ignore "$(STATICCHECK_IGNORE)" $(pkgs)
-
-build: $(PROMU)
-        @echo ">> building binaries"
-        @$(PROMU) build --prefix $(PREFIX)
-
-tarball: $(PROMU)
-        @echo ">> building release tarball"
-        @$(PROMU) tarball --prefix $(PREFIX) $(BIN_DIR)
-
 docker:
 ifeq ($(MACH), ppc64le)
         $(eval DOCKERFILE=Dockerfile.ppc64le)
@@ -138,20 +109,13 @@ test-docker:
         @echo ">> testing docker image"
         ./test_image.sh "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" 9100
 
-$(GOPATH)/bin/promtool promtool:
+$(FIRST_GOPATH)/bin/promtool promtool:
         @GOOS= GOARCH= $(GO) get -u github.com/prometheus/prometheus/cmd/promtool
 
-$(GOPATH)/bin/promu promu:
-        @GOOS= GOARCH= $(GO) get -u github.com/prometheus/promu
-
-$(GOPATH)/bin/staticcheck:
-        @GOOS= GOARCH= $(GO) get -u honnef.co/go/tools/cmd/staticcheck
-
-
-.PHONY: all style format build test test-e2e vet tarball docker promtool promu staticcheck checkmetrics
+.PHONY: test-e2e promtool checkmetrics
 
 # Declaring the binaries at their default locations as PHONY targets is a hack
 # to ensure the latest version is downloaded on every make execution.
 # If this is not desired, copy/symlink these binaries to a different path and
 # set the respective environment variables.
-.PHONY: $(GOPATH)/bin/promtool $(GOPATH)/bin/promu $(GOPATH)/bin/staticcheck
+.PHONY: $(FIRST_GOPATH)/bin/promtool