Skip to content

Commit

Permalink
Merge pull request cosmos#101 from Liamsi/go-bindata
Browse files Browse the repository at this point in the history
Get rid of go-bindata in Makefile
  • Loading branch information
ebuchman authored May 21, 2018
2 parents 906331a + a8910a3 commit 3399ca9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
GOTOOLS = \
github.com/golang/dep/cmd/dep \
github.com/jteeuwen/go-bindata/go-bindata
# gopkg.in/alecthomas/gometalinter.v2 \
#
GOTOOLS_CHECK = dep go-bindata #gometalinter.v2
GOTOOLS_CHECK = dep #gometalinter.v2

all: check get_vendor_deps build test install

Expand All @@ -13,9 +12,10 @@ check: check_tools
########################################
### Build

# Command to generate the workd list (kept here for documentation purposes only):
wordlist:
# Generating wordlist.go...
go-bindata -ignore ".*\.go" -o keys/words/wordlist/wordlist.go -pkg "wordlist" keys/words/wordlist/...
# To re-generate wordlist.go run:
# go-bindata -ignore ".*\.go" -o keys/words/wordlist/wordlist.go -pkg "wordlist" keys/words/wordlist/...

build: wordlist
# Nothing else to build!
Expand Down Expand Up @@ -96,4 +96,4 @@ metalinter_all:
# To avoid unintended conflicts with file names, always add to .PHONY
# unless there is a reason not to.
# https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html
.PHONEY: check wordlist build install check_tools get_tools update_tools get_vendor_deps test fmt metalinter metalinter_all
.PHONEY: check build install check_tools get_tools update_tools get_vendor_deps test fmt metalinter metalinter_all
8 changes: 4 additions & 4 deletions keys/words/wordlist/wordlist.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3399ca9

Please sign in to comment.