diff options
| author |  Vijay Pai <vpai@google.com> | 2016-01-11 10:30:38 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-01-11 10:30:38 -0800 |
| commit | b3a6787bd52a9fe4a68114cbe5cd45926287da17 (patch) | |
| tree | 2d52c30933afee569c8fc8dfec46c1d1a91c8060 /templates/Makefile.template | |
| parent | 7f34c783c4735ce16c22cd4c92d989d4bb0e2822 (diff) | |
| parent | cd92509e40adaae67edd683593da07e9b98fc6d9 (diff) | |
Merge pull request #4525 from ctiller/proto_names
Consolidate C++ proto files under src/proto
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index a09dd794ad..ba5a80659c 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1253,12 +1253,12 @@ $(GENDIR)/${p}.pb.cc: protoc_dep_error $(GENDIR)/${p}.grpc.pb.cc: protoc_dep_error else - $(GENDIR)/${p}.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) + $(GENDIR)/${p}.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) ${' '.join('$(GENDIR)/%s.pb.cc' % q for q in proto_deps.get(p, []))} $(E) "[PROTOC] Generating protobuf CC file from $<" $(Q) mkdir -p `dirname $@` $(Q) $(PROTOC) --cpp_out=$(GENDIR) $< - $(GENDIR)/${p}.grpc.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) + $(GENDIR)/${p}.grpc.pb.cc: ${p}.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) ${' '.join('$(GENDIR)/%s.pb.cc $(GENDIR)/%s.grpc.pb.cc' % (q,q) for q in proto_deps.get(p, []))} $(E) "[GRPC] Generating gRPC's protobuf service CC file from $<" $(Q) mkdir -p `dirname $@` $(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $< |