From e67d2e7356bb763d0ecf80bc867dccc36e15f946 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 11 Apr 2017 15:34:36 -0400 Subject: [PATCH] The "all" target shouldn't do any installing Remove "install.tools" as a dependency of the top-level "all" target, and make it a dependency of the "install" target. Signed-off-by: Nalin Dahyabhai Closes: #62 Approved by: rhatdan --- Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 299790f90..406355c12 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ BINDIR := $(PREFIX)/bin BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions BUILDFLAGS := -tags "$(AUTOTAGS) $(TAGS)" -all: buildah install.tools docs +all: buildah docs buildah: *.go cmd/buildah/*.go go build -o buildah $(BUILDFLAGS) ./cmd/buildah @@ -16,7 +16,7 @@ clean: .PHONY: docs docs: ## build the docs on the host - $(MAKE) -C docs docs + $(MAKE) -C docs # For vendoring to work right, the checkout directory must be such that our top # level is at $GOPATH/src/github.com/projectatomic/buildah. @@ -37,23 +37,16 @@ validate: .PHONY: install.tools install.tools: + go get -u $(BUILDFLAGS) github.com/cpuguy83/go-md2man go get -u $(BUILDFLAGS) github.com/vbatts/git-validation go get -u $(BUILDFLAGS) gopkg.in/alecthomas/gometalinter.v1 gometalinter.v1 -i +.PHONY: install install: install -D -m0755 buildah $(BINDIR)/buildah $(MAKE) -C docs install - -.PHONY: install.tools - -install.tools: .install.md2man - -.install.md2man: - go get github.com/cpuguy83/go-md2man - - .PHONY: install.completions install.completions: install -d -m 755 ${BASHINSTALLDIR}