From 34a072aea9e2785fdcadbd3f72a17db579809c35 Mon Sep 17 00:00:00 2001 From: Jiachen Yang Date: Tue, 19 Dec 2017 10:45:18 +0900 Subject: [PATCH] go get once to avoid errors when parallel build --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b4b7c46..7e1b985 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -.PHONY: all clean install uninstall +.PHONY: all clean install uninstall deps GOBUILD=go build -GOGET=go get -d -v . +GOGET=go get -d -v PREFIX=/usr/local all: doh-client/doh-client doh-server/doh-server @@ -22,8 +22,11 @@ uninstall: $(MAKE) -C systemd uninstall "DESTDIR=$(DESTDIR)" "PREFIX=$(PREFIX)" $(MAKE) -C NetworkManager uninstall "DESTDIR=$(DESTDIR)" "PREFIX=$(PREFIX)" -doh-client/doh-client: doh-client/client.go doh-client/config.go doh-client/main.go json-dns/error.go json-dns/globalip.go json-dns/marshal.go json-dns/response.go json-dns/unmarshal.go - cd doh-client && $(GOGET) && $(GOBUILD) +deps: + $(GOGET) ./doh-client ./doh-server -doh-server/doh-server: doh-server/config.go doh-server/main.go doh-server/server.go json-dns/error.go json-dns/globalip.go json-dns/marshal.go json-dns/response.go json-dns/unmarshal.go - cd doh-server && $(GOGET) && $(GOBUILD) +doh-client/doh-client: deps doh-client/client.go doh-client/config.go doh-client/main.go json-dns/error.go json-dns/globalip.go json-dns/marshal.go json-dns/response.go json-dns/unmarshal.go + cd doh-client && $(GOBUILD) + +doh-server/doh-server: deps doh-server/config.go doh-server/main.go doh-server/server.go json-dns/error.go json-dns/globalip.go json-dns/marshal.go json-dns/response.go json-dns/unmarshal.go + cd doh-server && $(GOBUILD)