Skip to content

Commit de9a7cb

Browse files
tboergerThomas Boerger
authored andcommitted
Replaced bindata task with go generate task
1 parent 41ea158 commit de9a7cb

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: errcheck
5556
errcheck:
5657
@which errcheck > /dev/null; if [ $$? -ne 0 ]; then \
@@ -124,14 +125,6 @@ latest-check:
124125
.PHONY: publish
125126
publish: release latest
126127

127-
.PHONY: bindata
128-
bindata: modules/bindata/bindata.go
129-
130-
.IGNORE: modules/bindata/bindata.go
131-
modules/bindata/bindata.go: $(BINDATA)
132-
go-bindata -o=$@ -ignore="\\.go|README.md|TRANSLATORS" -pkg=bindata conf/...
133-
go fmt $@
134-
135128
.PHONY: javascripts
136129
javascripts: public/js/index.js
137130

@@ -146,5 +139,5 @@ stylesheets: public/css/index.css
146139
public/css/index.css: $(STYLESHEETS)
147140
lessc $< $@
148141

149-
.PHONY: generate
150-
generate: bindata javascripts stylesheets
142+
.PHONY: assets
143+
assets: javascripts stylesheets

0 commit comments

Comments
 (0)