Makefile: merge build+install tags with DEV/PROD_TAGS, trim whitespace

This commit is contained in:
Conner Fromknecht 2018-09-26 04:31:40 -07:00
parent 57ec03564e
commit 1881ccdaf2
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7

@ -47,8 +47,11 @@ XARGS := xargs -L 1
include make/testing_flags.mk
DEV_TAGS := $(if ${tags},$(DEV_TAGS) ${tags},$(DEV_TAGS))
PROD_TAGS := $(if ${tags},$(PROD_TAGS) ${tags},$(PROD_TAGS))
COVER = for dir in $(GOLISTCOVER); do \
$(GOTEST) -tags="$(TEST_TAGS)" \
$(GOTEST) -tags="$(DEV_TAGS) $(LOG_TAGS)" \
-covermode=count \
-coverprofile=$$dir/profile.tmp $$dir; \
\
@ -130,13 +133,13 @@ btcd: $(GLIDE_BIN) $(BTCD_DIR)
build:
@$(call print, "Building debug lnd and lncli.")
$(GOBUILD) -tags="$(TEST_TAGS) ${tags}" -o lnd-debug $(LDFLAGS) $(PKG)
$(GOBUILD) -tags="$(TEST_TAGS) ${tags}" -o lncli-debug $(LDFLAGS) $(PKG)/cmd/lncli
$(GOBUILD) -tags="$(DEV_TAGS)" -o lnd-debug $(LDFLAGS) $(PKG)
$(GOBUILD) -tags="$(DEV_TAGS)" -o lncli-debug $(LDFLAGS) $(PKG)/cmd/lncli
install:
@$(call print, "Installing lnd and lncli.")
go install -v -tags="${tags}" $(LDFLAGS) $(PKG)
go install -v -tags="${tags}" $(LDFLAGS) $(PKG)/cmd/lncli
go install -v -tags="$(PROD_TAGS)" $(LDFLAGS) $(PKG)
go install -v -tags="$(PROD_TAGS)" $(LDFLAGS) $(PKG)/cmd/lncli
scratch: dep build