diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-11 02:25:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 02:25:41 -0800 |
| commit | 26f2b7debde313af4a5ae39727c66a3f8fd59be4 (patch) | |
| tree | 1ab2968feabc60768ac04c7f832ddfb93f97e3ad /Makefile | |
| parent | 36d96c19f947aeac2675afe64a3b482e54f9e4c4 (diff) | |
| parent | 3966d3bf4e6be2975c330af64ce6ba86b4eeabe0 (diff) | |
| download | podman-26f2b7debde313af4a5ae39727c66a3f8fd59be4.tar.gz podman-26f2b7debde313af4a5ae39727c66a3f8fd59be4.tar.bz2 podman-26f2b7debde313af4a5ae39727c66a3f8fd59be4.zip | |
Merge pull request #2105 from mheon/jsoniter
Use jsoniter instead of easyjson
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 2 insertions, 17 deletions
@@ -185,7 +185,7 @@ run-perftest: perftest vagrant-check: BOX=$(BOX) sh ./vagrant.sh -binaries: varlink_generate easyjson_generate podman +binaries: varlink_generate podman install.catatonit: ./hack/install_catatonit.sh @@ -265,7 +265,7 @@ uninstall: .PHONY: install.tools -install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.easyjson .install.ginkgo .install.gomega +install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo .install.gomega .install.gomega: .gopathok $(GO) get github.com/onsi/gomega/... @@ -294,11 +294,6 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins $(GO) get -u github.com/cpuguy83/go-md2man; \ fi -.install.easyjson: .gopathok - if [ ! -x "$(GOBIN)/easyffjson" ]; then \ - $(GO) get -u github.com/mailru/easyjson/...; \ - fi - .install.ostree: .gopathok if ! pkg-config ostree-1 2> /dev/null ; then \ git clone https://github.com/ostreedev/ostree $(FIRST_GOPATH)/src/github.com/ostreedev/ostree ; \ @@ -310,16 +305,6 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins varlink_generate: .gopathok cmd/podman/varlink/iopodman.go varlink_api_generate: .gopathok API.md -easyjson_generate: .gopathok libpod/container_easyjson.go libpod/pod_easyjson.go - -libpod/container_easyjson.go: libpod/container.go - rm -f libpod/container_easyjson.go - cd "$(GOPKGDIR)" && easyjson -build_tags "$(BUILDTAGS)" ./libpod/container.go - -libpod/pod_easyjson.go: libpod/pod.go - rm -f libpod/pod_easyjson.go - cd "$(GOPKGDIR)" && easyjson -build_tags "$(BUILDTAGS)" ./libpod/pod.go - .PHONY: install.libseccomp.sudo install.libseccomp.sudo: rm -rf ../../seccomp/libseccomp |