Skip to content

Commit 2b81483

Browse files
committed
Replaced bindata task with go generate task
1 parent 7214e93 commit 2b81483

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

Makefile

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ clean:
3737
go clean -i ./...
3838
rm -rf $(BIN) $(DIST)
3939

40-
.PHONY: deps
41-
deps:
42-
@which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
43-
go get -u github.com/jteeuwen/go-bindata/...; \
44-
fi
45-
4640
.PHONY: fmt
4741
fmt:
4842
go fmt $(PACKAGES)
@@ -51,6 +45,13 @@ fmt:
5145
vet:
5246
go vet $(PACKAGES)
5347

48+
.PHONY: generate
49+
generate:
50+
@which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
51+
go get -u github.com/jteeuwen/go-bindata/...; \
52+
fi
53+
go generate $(PACKAGES)
54+
5455
.PHONY: lint
5556
lint:
5657
@which golint > /dev/null; if [ $$? -ne 0 ]; then \
@@ -106,14 +107,6 @@ latest-check:
106107
.PHONY: publish
107108
publish: release latest
108109

109-
.PHONY: bindata
110-
bindata: modules/bindata/bindata.go
111-
112-
.IGNORE: modules/bindata/bindata.go
113-
modules/bindata/bindata.go: $(BINDATA)
114-
go-bindata -o=$@ -ignore="\\.go|README.md|TRANSLATORS" -pkg=bindata conf/...
115-
go fmt $@
116-
117110
.PHONY: javascripts
118111
javascripts: public/js/index.js
119112

@@ -128,5 +121,5 @@ stylesheets: public/css/index.css
128121
public/css/index.css: $(STYLESHEETS)
129122
lessc $< $@
130123

131-
.PHONY: generate
132-
generate: bindata javascripts stylesheets
124+
.PHONY: assets
125+
assets: javascripts stylesheets

0 commit comments

Comments
 (0)