glide -> dep

Author: papix

.gitignore

@@ -1,4 +1,3 @@
-.vendor
-vendor
-bin/primus-client
-bin/primus-server
+/build
+/tmp
+/vendor

Gopkg.lock

@@ -0,0 +1,38 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/BurntSushi/toml"
+  version = "0.2.0"
+
+[[constraint]]
+  name = "github.com/Sirupsen/logrus"
+  version = "0.11.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Gopkg.toml

@@ -1,18 +1,18 @@
-TARGETS_NOVENDOR=$(shell glide novendor)
+DEP ?= dep
+BUILD_DIR = ./build
+PRIMUS_CLIENT = $(BUILD_DIR)/primus-client
+PRIMUS_SERVER = $(BUILD_DIR)/primus-server
 
-all: bin/primus-server bin/primus-client
+all: deps $(PRIMUS_CLIENT) $(PRIMUS_SERVER)
 
-bundle:
-	glide install
+deps:
+	$(DEP) ensure -vendor-only
 
-bin/primus-server: cmd/primus/server/main.go server/*.go
-	go build $(GOFLAGS) -o bin/primus-server cmd/primus/server/main.go
+$(PRIMUS_CLIENT):
+	go build -o $(PRIMUS_CLIENT) cmd/primus/client/main.go
 
-bin/primus-client: cmd/primus/client/main.go client/*.go
-	go build $(GOFLAGS) -o bin/primus-client cmd/primus/client/main.go
-
-fmt:
-	@echo $(TARGETS_NOVENDOR) | xargs go fmt
+$(PRIMUS_SERVER):
+	go build -o $(PRIMUS_SERVER) cmd/primus/server/main.go
 
 clean:
-	rm -rf bin/primus*
+	rm -rf $(BUILD_DIR)