summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--cmd/podman/ioprojectatomicpodman/generate.go2
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