From 5af0d538ca792aae9803fcaf4ebbb0a02458177a Mon Sep 17 00:00:00 2001 From: gdm85 Date: Thu, 13 May 2021 19:20:46 +0200 Subject: [PATCH] Remove deps download, modern Go does it automatically --- Makefile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index a122f7d..e65c210 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,11 @@ -.PHONY: all clean install uninstall deps +.PHONY: all clean install uninstall PREFIX = /usr/local ifeq ($(GOROOT),) GOBUILD = go build -GOGET = go get -d -v -GOGET_UPDATE = go get -d -u -v else GOBUILD = $(GOROOT)/bin/go build -GOGET = $(GOROOT)/bin/go get -d -v -GOGET_UPDATE = $(GOROOT)/bin/go get -d -u -v endif ifeq ($(shell uname),Darwin) @@ -57,14 +53,8 @@ uninstall: $(MAKE) -C launchd uninstall "DESTDIR=$(DESTDIR)"; \ fi -deps: - @# I am not sure if it is the correct way to keep the common library updated - $(GOGET_UPDATE) github.com/m13253/dns-over-https/doh-client/config - $(GOGET_UPDATE) github.com/m13253/dns-over-https/json-dns - $(GOGET) ./doh-client ./doh-server - -doh-client/doh-client: deps doh-client/client.go doh-client/config/config.go doh-client/google.go doh-client/ietf.go doh-client/main.go doh-client/version.go json-dns/error.go json-dns/globalip.go json-dns/marshal.go json-dns/response.go json-dns/unmarshal.go +doh-client/doh-client: doh-client/client.go doh-client/config/config.go doh-client/google.go doh-client/ietf.go doh-client/main.go doh-client/version.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/google.go doh-server/ietf.go doh-server/main.go doh-server/server.go doh-server/version.go json-dns/error.go json-dns/globalip.go json-dns/marshal.go json-dns/response.go json-dns/unmarshal.go +doh-server/doh-server: doh-server/config.go doh-server/google.go doh-server/ietf.go doh-server/main.go doh-server/server.go doh-server/version.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)