From 18b33c77078fd68f2877dce0a764890ff5949c7a Mon Sep 17 00:00:00 2001
From: Thomas Rudin <thomas@rudin.io>
Date: Thu, 24 Jan 2019 19:20:11 +0100
Subject: [PATCH] go modules

---
 server/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/Makefile b/server/Makefile
index 8cd77d5..da861e9 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,6 +1,7 @@
 
 STATIC_VFS=vfs/static.go
 OUT_DIR=output
+ENV=GO111MODULE=on
 
 all: build
 
@@ -8,25 +9,21 @@ $(OUT_DIR):
 	mkdir $@
 
 test: $(STATIC_VFS) $(OUT_DIR)
-	go test ./...
+	$(ENV) go test ./...
 
 clean:
 	rm -rf $(STATIC_VFS)
 	rm -rf $(OUT_DIR)
 
 $(STATIC_VFS):
-	test -f ${HOME}/go/bin/esc || go get github.com/mjibson/esc
+	test -f ${HOME}/go/bin/esc || $(ENV) go get github.com/mjibson/esc
 	${HOME}/go/bin/esc -o $@ -prefix="static/" -pkg vfs static
 
 build: $(STATIC_VFS) $(OUT_DIR)
-	GOOS=linux GOARCH=386 go build -o $(OUT_DIR)/mapserver-linux-x86
+	$(ENV) GOOS=linux GOARCH=386 go build -o $(OUT_DIR)/mapserver-linux-x86
 	GOOS=linux GOARCH=amd64 go build -o $(OUT_DIR)/mapserver-linux-x86_64
 	GOOS=linux GOARCH=arm go build -o $(OUT_DIR)/mapserver-linux-arm
 	GOOS=darwin GOARCH=386 go build -o $(OUT_DIR)/mapserver-darwin-x86
 	GOOS=darwin GOARCH=amd64 go build -o $(OUT_DIR)/mapserver-darwin-x86_64
 	GOOS=windows GOARCH=386 go build -o $(OUT_DIR)/mapserver-windows-x86
 	GOOS=windows GOARCH=amd64 go build -o $(OUT_DIR)/mapserver-windows-x86_64
-
-profile:
-	go test -cpuprofile=cprof ./tilerenderer
-	go tool pprof --text cprof