From 57359619e8b2154c3f5841256f2ee9e4f0b1c067 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@harald-hoyer.de>
Date: Wed, 25 Apr 2018 18:15:08 +0200
Subject: Only generate the varlink glue code if needed and from the vendor dir

Closes: #671
Approved by: baude
---
 Makefile                                     | 8 ++------
 cmd/podman/ioprojectatomicpodman/generate.go | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index fa1311d6e..f9813c012 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,6 @@ endif
 	rm -f test/copyimg/copyimg
 	rm -f test/checkseccomp/checkseccomp
 	rm -fr build/
-	rm -f cmd/podman/ioprojectatomicpodman/ioprojectatomicpodman.go
 
 libpodimage:
 	docker build -t ${LIBPOD_IMAGE} .
@@ -248,12 +247,9 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
 		make all install; \
 	fi
 
-.install.varlink: .gopathok
-	$(GO) get -u github.com/varlink/go/varlink
-	$(GO) get -u github.com/varlink/go/cmd/varlink-go-interface-generator
+varlink_generate: .gopathok cmd/podman/ioprojectatomicpodman/ioprojectatomicpodman.go
 
-varlink_generate: .gopathok .install.varlink
-	rm -f cmd/podman/ioprojectatomicpodman/ioprojectatomicpodman.go
+cmd/podman/ioprojectatomicpodman/ioprojectatomicpodman.go: cmd/podman/ioprojectatomicpodman/io.projectatomic.podman.varlink
 	$(GO) generate ./cmd/podman/ioprojectatomicpodman/...
 
 validate: gofmt .gitvalidation
diff --git a/cmd/podman/ioprojectatomicpodman/generate.go b/cmd/podman/ioprojectatomicpodman/generate.go
index b24234f0a..b07f8b06b 100644
--- a/cmd/podman/ioprojectatomicpodman/generate.go
+++ b/cmd/podman/ioprojectatomicpodman/generate.go
@@ -1,3 +1,3 @@
 package ioprojectatomicpodman
 
-//go:generate $GOPATH/bin/varlink-go-interface-generator io.projectatomic.podman.varlink
+//go:generate go run ../../../vendor/github.com/varlink/go/cmd/varlink-go-interface-generator/main.go io.projectatomic.podman.varlink
-- 
cgit v1.2.3-54-g00ecf