From 07f3b147f1619b234cad0fda3d7556c1f05e7f11 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Tue, 8 Jan 2019 13:47:51 -0500
Subject: Remove easyjson in preparation for switch to jsoniter

The jsoniter library does not require code generation, which is a
massive advantage over easyjson (it's also about the same in
performance). Begin moving over to it by removing the existing
easyjson code.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 Makefile | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c672fd947..8aaa38748 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3-54-g00ecf