From d0d75a98c29e1ea9b88827fa365a558b73e95372 Mon Sep 17 00:00:00 2001
From: jaketaylor <jake@privategrity.com>
Date: Fri, 15 May 2020 13:33:07 -0700
Subject: [PATCH] update makefile

---
 Makefile                | 15 +++++++++++----
 globals/version_vars.go | 20 +++++++++++++-------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index a2a6eef59..38e5caad0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,18 @@
-.PHONY: update master release setup update_master update_release build
+.PHONY: update master release setup update_master update_release build clean version
 
 setup:
 	git config --global --add url."git@gitlab.com:".insteadOf "https://gitlab.com/"
 
-update:
+version:
+	go run main.go generate
+	sed -i bak 's/package\ cmd/package\ globals/g' version_vars.go
+	mv version_vars.go globals/version_vars.go
+
+clean:
 	rm -rf vendor/
 	go mod vendor
+
+update:
 	-GOFLAGS="" go get -u all
 
 build:
@@ -22,6 +29,6 @@ update_master:
 	GOFLAGS="" go get -u gitlab.com/elixxir/crypto@master
 	GOFLAGS="" go get -u gitlab.com/elixxir/comms@master
 
-master: update update_master build
+master: clean update_master build version
 
-release: update update_release build
+release: clean update_release build version
diff --git a/globals/version_vars.go b/globals/version_vars.go
index 03a571a0a..8878a134d 100644
--- a/globals/version_vars.go
+++ b/globals/version_vars.go
@@ -1,9 +1,15 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2020 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 // Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
-// 2020-05-12 21:02:57.275479486 +0000 UTC m=+0.003920070
+// 2020-05-15 13:25:08.127867 -0700 PDT m=+0.028882236
 package globals
 
-const GITVERSION = `daeebfe disable stdout on the global jww logger`
+const GITVERSION = `0e6d5ed update deps`
 const SEMVER = "1.3.0"
 const DEPENDENCIES = `module gitlab.com/elixxir/client
 
@@ -11,7 +17,7 @@ go 1.13
 
 require (
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
-	github.com/golang/protobuf v1.4.0
+	github.com/golang/protobuf v1.4.2
 	github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
 	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/pkg/errors v0.9.1
@@ -22,10 +28,10 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.6.2
-	gitlab.com/elixxir/comms v0.0.0-20200415204952-6d63dd94a0ea
-	gitlab.com/elixxir/crypto v0.0.0-20200410231849-90e859940f5d
-	gitlab.com/elixxir/primitives v0.0.0-20200410231944-a57d71d577c9
-	golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
+	gitlab.com/elixxir/comms v0.0.0-20200515170447-d88e95684f9c
+	gitlab.com/elixxir/crypto v0.0.0-20200514211323-de119c132b78
+	gitlab.com/elixxir/primitives v0.0.0-20200514181428-14736275e533
+	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
 	gopkg.in/ini.v1 v1.52.0 // indirect
 )
 `
-- 
GitLab