From 3f7bd5dec2832b315605558b16fe53d43da751fe Mon Sep 17 00:00:00 2001
From: James Phillips <james@hashicorp.com>
Date: Wed, 17 Feb 2016 20:36:48 -0800
Subject: [PATCH] Tweaks some of the default makefile targets.

---
 GNUmakefile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index ceb8f9340f..a2f093e93a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,27 +5,24 @@ VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
          -nilfunc -printf -rangeloops -shift -structtags -unsafeptr
 VERSION?=$(shell awk -F\" '/^const Version/ { print $$2; exit }' version.go)
 
-all: format tools
+# all builds binaries for all targets
+all: tools
 	@mkdir -p bin/
-	@bash --norc -i ./scripts/build.sh
-
-# bin generates binaries for all platforms
-bin:
 	@sh -c "'$(CURDIR)/scripts/build.sh'"
 
 # dev creates binaries for testing locally - these are put into ./bin and $GOPATH
-dev:
+dev: format
 	@CONSUL_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'"
 
-# dist packages the binaries for distibution
-dist: bin
+# dist builds binaries for all platforms and packages them for distribution
+dist:
 	@sh -c "'$(CURDIR)/scripts/dist.sh' $(VERSION)"
 
 cov:
 	gocov test ./... | gocov-html > /tmp/coverage.html
 	open /tmp/coverage.html
 
-test:
+test: format
 	@$(MAKE) vet
 	@./scripts/verify_no_uuid.sh
 	@./scripts/test.sh