From c6f350d2c01f4585b3515d6749988be480c3d447 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Wed, 27 Jul 2016 09:44:34 +1000 Subject: [PATCH] Remove Go-specific logic from Makefile (#60) Since Go is no longer generated from this repo, make will now error if we set LANGUAGE=go. --- Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index bc83d0121..7546fc1f3 100644 --- a/Makefile +++ b/Makefile @@ -23,19 +23,15 @@ PROTOINCLUDE ?= /usr/local/include # NOTE: if "protoc" command is not in the PATH, you need to modify this file. # -FLAGS+= --proto_path=.:$(PROTOINCLUDE) ifeq ($(LANGUAGE),go) - FLAGS+= --$(LANGUAGE)_out=plugins=grpc:$(OUTPUT) -else - FLAGS+= --$(LANGUAGE)_out=$(OUTPUT) --grpc_out=$(OUTPUT) - FLAGS+= --plugin=protoc-gen-grpc=$(GPRCPLUGIN) +$(error Go source files are not generated from this repository. See: https://github.com/google/go-genproto) endif -ifeq ($(LANGUAGE),go) -SUFFIX:= pb.go -else +FLAGS+= --proto_path=.:$(PROTOINCLUDE) +FLAGS+= --$(LANGUAGE)_out=$(OUTPUT) --grpc_out=$(OUTPUT) +FLAGS+= --plugin=protoc-gen-grpc=$(GPRCPLUGIN) + SUFFIX:= pb.cc -endif DEPS:= $(shell find google $(PROTOINCLUDE)/google/protobuf -type f -name '*.proto' | sed "s/proto$$/$(SUFFIX)/")