diff options
| author |  Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2015-11-03 16:50:31 -0500 |
|---|---|---|
| committer | Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2015-11-03 16:50:31 -0500 |
| commit | 241a5ad3cbb921e99f2ba45789d3acf65a5a845a (patch) | |
| tree | 183d8dfde8a9b228014e5867fe8c8a42e71d0a08 | |
| parent | 392a1707c0051d56bd12616b4585e4e81e48af39 (diff) | |
| parent | 472bb6849cd9b51589e27d0d124e6a883d1de1e6 (diff) | |
Merge pull request #4030 from nicolasnoble/targets-can-have-protos-too
Fixing proto dependencies for targets that aren't libraries.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | templates/Makefile.template | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -10235,6 +10235,7 @@ ifneq ($(NO_DEPS),true) -include $(RECONNECT_INTEROP_CLIENT_OBJS:.o=.dep) endif endif +$(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc RECONNECT_INTEROP_SERVER_SRC = \ @@ -10281,6 +10282,7 @@ ifneq ($(NO_DEPS),true) -include $(RECONNECT_INTEROP_SERVER_OBJS:.o=.dep) endif endif +$(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_server.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc SECURE_AUTH_CONTEXT_TEST_SRC = \ @@ -10571,6 +10573,9 @@ ifneq ($(NO_DEPS),true) -include $(STRESS_TEST_OBJS:.o=.dep) endif endif +$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_test.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc SYNC_STREAMING_PING_PONG_TEST_SRC = \ diff --git a/templates/Makefile.template b/templates/Makefile.template index 115d8136b5..20d14c797f 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1851,6 +1851,11 @@ endif % endif % endif + % for src in tgt.src: + % if not proto_re.match(src) and any(proto_re.match(src2) for src2 in tgt.src): + $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: ${' '.join(proto_to_cc(src2) for src2 in tgt.src if proto_re.match(src2))} + % endif + % endfor </%def> ifneq ($(OPENSSL_DEP),) |