From 41f1a1434ace180f955317d1d8965a8644c6aa31 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sat, 5 May 2018 18:01:17 +0200 Subject: [PATCH] Pr 1770 (#1771) * make pb * Makefile for pb Move the Makefile into the pb directory to remove some clutter from the main Makefile. --- Makefile | 4 ++++ pb/Makefile | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pb/Makefile diff --git a/Makefile b/Makefile index 998b88d60..3b9452887 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,10 @@ core/zplugin.go core/dnsserver/zdirectives.go: plugin.cfg gen: go generate coredns.go +.PHONY: pb +pb: + $(MAKE) -C pb + .PHONY: linter linter: go get -u github.com/alecthomas/gometalinter diff --git a/pb/Makefile b/pb/Makefile new file mode 100644 index 000000000..bdfc8e3b0 --- /dev/null +++ b/pb/Makefile @@ -0,0 +1,11 @@ +# Generate the Go files from the dns.proto protobuf, you need the utilities +# from: https://github.com/golang/protobuf to make this work. +# The generate dns.pb.go is checked into git, so for normal builds we don't need +# to run this generation step. + +all: dns.pb.go + +dns.pb.go: dns.proto + protoc --go_out=plugins=grpc:. dns.proto && \ + sed -e s?golang.org/x/net/context?context? < dns.pb.go > dns.pb.go.tmp && \ + mv dns.pb.go.tmp dns.pb.go