From 3a45b8dd4104f8679f80de23d3fd89d92f24f02b Mon Sep 17 00:00:00 2001
From: Lukas Welte <info@lukaswelte.de>
Date: Thu, 7 Feb 2019 17:33:38 +0100
Subject: [PATCH] Move dependencies into Makefile

---
 .travis.yml |  9 ---------
 Makefile    | 13 ++++++++++++-
 README.md   | 19 ++-----------------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2914179b..d0c63cb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,6 @@ addons:
     paths:
     - bin
 install:
-- go get -u golang.org/x/sys/...
-- go get github.com/fsnotify/fsnotify
-- go get github.com/gorilla/handlers
-- go get github.com/gorilla/mux
-- go get github.com/gorilla/websocket
-- go get github.com/urfave/cli
-- go get github.com/elazarl/go-bindata-assetfs/...
-- go get github.com/jteeuwen/go-bindata/...
-- go get github.com/mitchellh/gox
 - wget https://raw.githubusercontent.com/openmaptiles/klokantech-basic-gl-style/master/style.json
 script:
 - make
diff --git a/Makefile b/Makefile
index f5ea7b43..fbcbc017 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,21 @@ EDITOR_VERSION ?= v1.5.0
 
 all: $(BINARY)
 
+dependencies:
+	go get -u golang.org/x/sys/...
+	go get github.com/gorilla/handlers
+	go get github.com/gorilla/mux
+	go get github.com/gorilla/websocket
+	go get github.com/fsnotify/fsnotify
+	go get github.com/urfave/cli
+	go get github.com/elazarl/go-bindata-assetfs/...
+	go get github.com/jteeuwen/go-bindata/...
+	go get github.com/mitchellh/gox
+
 $(BINARY): $(SOURCES) bindata_assetfs.go
 	gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "bin/{{.OS}}/${BINARY}"
 
-editor/create_folder:
+editor/create_folder: dependencies
 	mkdir -p editor
 
 editor/pull_release: editor/create_folder
diff --git a/README.md b/README.md
index 2745650a..6078d590 100644
--- a/README.md
+++ b/README.md
@@ -60,25 +60,10 @@ Clone the repository. Make sure you clone it into the correct directory `$GOPATH
 git clone git@github.com:maputnik/desktop.git
 ```
 
-Install the 3rd party dependencies.
-
-```
-go get -u golang.org/x/sys/...
-go get github.com/gorilla/handlers
-go get github.com/gorilla/mux
-go get github.com/gorilla/websocket
-go get github.com/fsnotify/fsnotify
-go get github.com/urfave/cli
-go get github.com/elazarl/go-bindata-assetfs/...
-go get github.com/jteeuwen/go-bindata/...
-go get github.com/mitchellh/gox
-```
-
-Run `make` to build the app distribution bundle and create the `maputnik` binary
-embedding the editor.
+Run `make` to install the 3rd party dependencies and build the `maputnik` binary embedding the editor.
 
 ```
 make
 ```
 
-You should now find the `maputnik` binary in your directory.
+You should now find the `maputnik` binary in your `bin` directory.