mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-06-15 04:05:07 +02:00
Fix dependencies to work in clean go1.6/1.7 environments.
This commit is contained in:
parent
5dcfeda1e9
commit
6b61789c36
6
Makefile
6
Makefile
|
@ -37,11 +37,11 @@ hook:
|
||||||
godeps:
|
godeps:
|
||||||
GOPATH=$(GOPATH) $(GO) get github.com/rogpeppe/godeps
|
GOPATH=$(GOPATH) $(GO) get github.com/rogpeppe/godeps
|
||||||
|
|
||||||
easyjson:
|
easyjson: dependencies
|
||||||
GOPATH=$(GOPATH) $(GO) get -d github.com/mailru/easyjson/...
|
GOPATH=$(GOPATH) $(GO) get -d github.com/mailru/easyjson/...
|
||||||
GOPATH=$(GOPATH) $(GO) build -o ./vendor/bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go
|
GOPATH=$(GOPATH) $(GO) build -o ./vendor/bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go
|
||||||
|
|
||||||
dependencies: hook godeps easyjson src/signaling/continentmap.go
|
dependencies: hook godeps src/signaling/continentmap.go
|
||||||
GOPATH=$(GOPATH) ./vendor/bin/godeps -u dependencies.tsv
|
GOPATH=$(GOPATH) ./vendor/bin/godeps -u dependencies.tsv
|
||||||
|
|
||||||
dependencies.tsv: godeps
|
dependencies.tsv: godeps
|
||||||
|
@ -82,7 +82,7 @@ coverhtml: dependencies vet common
|
||||||
%_easyjson.go: %.go
|
%_easyjson.go: %.go
|
||||||
PATH=$(shell dirname $(GO)):$(PATH) GOPATH=$(GOPATH) ./vendor/bin/easyjson -all $*.go
|
PATH=$(shell dirname $(GO)):$(PATH) GOPATH=$(GOPATH) ./vendor/bin/easyjson -all $*.go
|
||||||
|
|
||||||
common: \
|
common: easyjson \
|
||||||
src/signaling/api_signaling_easyjson.go \
|
src/signaling/api_signaling_easyjson.go \
|
||||||
src/signaling/api_backend_easyjson.go \
|
src/signaling/api_backend_easyjson.go \
|
||||||
src/signaling/natsclient_easyjson.go \
|
src/signaling/natsclient_easyjson.go \
|
||||||
|
|
Loading…
Reference in a new issue