From dca599726274fa3305ce67e45e38bc0ea9a837eb Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Wed, 24 Oct 2018 19:06:58 -0700
Subject: [PATCH] make: ensure make fmt is run with -s flag

Linting will fail if code is not formatted with the -s flag, so make
sure we always use it when formatting.
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 448b26f4..6a751a13 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ GOBUILD := go build -v
 GOINSTALL := go install -v
 GOTEST := go test -v
 
+GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
 GOLIST := go list $(PKG)/... | grep -v '/vendor/'
 GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./')
 GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc')
@@ -211,7 +212,7 @@ endif
 
 fmt:
 	@$(call print, "Formatting source.")
-	$(GOLIST) | $(XARGS) go fmt -x
+	gofmt -l -w -s $(GOFILES_NOVENDOR)
 
 lint: $(LINT_BIN)
 	@$(call print, "Linting source.")