Merge pull request #6411 from ipfs/build/gogo-from-gomod

build: use protoc-gen-* from gomod

.gitignore

@@ -15,6 +15,7 @@ gx-workspace-update.json
 
 .ipfs
 bin/gx
+bin/protoc-*
 bin/gx*
 bin/tmp
 bin/gocovmerge

Makefile

@@ -2,8 +2,6 @@
 
 SHELL=PATH='$(PATH)' /bin/sh
 
-PROTOC = protoc --gogofaster_out=. --proto_path=.:$(GOPATH)/src:$(dir $@) $<
-
 # enable second expansion
 .SECONDEXPANSION:
 

Rules.mk

@@ -5,6 +5,7 @@ DISTCLEAN :=
 TEST :=
 TEST_SHORT :=
 GOCC ?= go
+PROTOC ?= protoc
 
 all: help    # all has to be first defined target
 .PHONY: all
@@ -58,8 +59,8 @@ include $(dir)/Rules.mk
 #   universal rules    #
 # -------------------- #
 
-%.pb.go: %.proto
-	$(PROTOC)
+%.pb.go: %.proto bin/protoc-gen-gogofaster
+	$(PROTOC) --gogofaster_out=. --proto_path=.:$(GOPATH)/src:$(dir $@) $<
 
 # -------------------- #
 #     core targets     #

bin/Rules.mk

@@ -2,8 +2,8 @@ include mk/header.mk
 
 dist_root_$(d)="/ipfs/QmPrXH9jRVwvd7r5MC5e6nV4uauQGzLk1i2647Ye9Vbbwe"
 
-TGTS_$(d) := $(d)/gx $(d)/gx-go
-DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp
+TGTS_$(d) := $(d)/protoc
+DISTCLEAN += $(d)/protoc $(d)/tmp
 
 PATH := $(realpath $(d)):$(PATH)
 
@@ -15,5 +15,8 @@ else
 	ln -s $(notdir $^) $@
 endif
 
+bin/protoc-gen-gogofaster:
+	$(call go-build,github.com/gogo/protobuf/protoc-gen-gogofaster)
+
 CLEAN += $(TGTS_$(d))
 include mk/footer.mk