Makefile: reorder definitions before include + proper tabbing

This commit is contained in:
Conner Fromknecht 2018-08-09 23:17:07 -07:00
parent c520f89229
commit 05e55c44ce
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7

@ -40,14 +40,21 @@ GOLIST := go list $(PKG)/... | grep -v '/vendor/'
GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./') GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./')
GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc') GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc')
RM := rm -f
CP := cp
MAKE := make
XARGS := xargs -L 1
include make/testing_flags.mk
COVER = for dir in $(GOLISTCOVER); do \ COVER = for dir in $(GOLISTCOVER); do \
$(GOTEST) $(TEST_FLAGS) \ $(GOTEST) -tags="$(TEST_TAGS)" \
-covermode=count \ -covermode=count \
-coverprofile=$$dir/profile.tmp $$dir; \ -coverprofile=$$dir/profile.tmp $$dir; \
\ \
if [ $$? != 0 ] ;\ if [ $$? != 0 ] ;\
then \ then \
exit 1 ;\ exit 1; \
fi ;\ fi ;\
\ \
if [ -f $$dir/profile.tmp ]; then \ if [ -f $$dir/profile.tmp ]; then \
@ -69,19 +76,12 @@ LINT = $(LINT_BIN) \
CGO_STATUS_QUO := ${CGO_ENABLED} CGO_STATUS_QUO := ${CGO_ENABLED}
RM := rm -f
CP := cp
MAKE := make
XARGS := xargs -L 1
GREEN := "\\033[0;32m" GREEN := "\\033[0;32m"
NC := "\\033[0m" NC := "\\033[0m"
define print define print
echo $(GREEN)$1$(NC) echo $(GREEN)$1$(NC)
endef endef
include make/testing_flags.mk
default: scratch default: scratch
all: scratch check install all: scratch check install