From 7614554885cc1e8113a0b5271d400aa59cac987e Mon Sep 17 00:00:00 2001 From: Gary Belvin Date: Thu, 4 Jun 2015 08:54:34 -0700 Subject: [PATCH] only look in the google folder for proto files --- Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index ccd1f2f97..23fb8d3eb 100644 --- a/Makefile +++ b/Makefile @@ -27,19 +27,13 @@ else endif ifeq ($(LANGUAGE),go) -SUFFIX:= .pb.go +SUFFIX:= pb.go endif ifeq ($(LANGUAGE),cpp) -SUFFIX:= .pb.cc -endif -ifeq ($(LANGUAGE),py) -SUFFIX:= _pb2.py -endif -ifeq ($(LANGUAGE),java) -SUFFIX:= .java +SUFFIX:= pb.cc endif -DEPS:= $(shell find . -type f -name '*.proto' | sed "s/\.proto$$/$(SUFFIX)/") +DEPS:= $(shell find google -type f -name '*.proto' | sed "s/proto$$/$(SUFFIX)/") all: supported_lang $(DEPS) @@ -48,7 +42,7 @@ ifndef SUFFIX $(error unsupported language: [$(LANGUAGE)]) endif -%$(SUFFIX): %.proto +%.$(SUFFIX): %.proto mkdir -p $(OUTPUT) protoc $(FLAGS) $(dir $<)*.proto