Repository: mesos Updated Branches: refs/heads/master b7ad2c0d4 -> 607374b53
Fixed build dependencies in libprocess. Sometimes `libprocess` can fail to build due to missing protobuf files. This adds protobufs to `BUILT_SOURCES` to ensure they are generated before other files are compiled. Review: https://reviews.apache.org/r/63984/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/607374b5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/607374b5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/607374b5 Branch: refs/heads/master Commit: 607374b53684e5ed7a72835f7bed07d367aa680d Parents: b7ad2c0 Author: Dmitry Zhuk <dz...@twopensource.com> Authored: Tue Nov 21 22:08:36 2017 +0100 Committer: Alexander Rukletsov <al...@apache.org> Committed: Tue Nov 21 22:08:36 2017 +0100 ---------------------------------------------------------------------- 3rdparty/libprocess/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/607374b5/3rdparty/libprocess/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am index 896be0c..ba9e781 100644 --- a/3rdparty/libprocess/Makefile.am +++ b/3rdparty/libprocess/Makefile.am @@ -396,7 +396,9 @@ libprocess_tests_LDADD += \ endif BUILT_SOURCES = \ - $(BUNDLED_DEPS) + $(BUNDLED_DEPS) \ + $(BENCHMARKS_PROTOS) \ + $(GRPC_TESTS_PROTOS) nodist_benchmarks_SOURCES = \ $(BENCHMARKS_PROTOS) @@ -410,11 +412,11 @@ CLEANFILES = \ # Targets for generating C++ protocol buffer and gRPC code for tests. -%.pb.cc %.pb.h: src/tests/%.proto - $(PROTOC) -I$(^D) --cpp_out=. $^ +%.pb.cc %.pb.h: src/tests/%.proto $(BUNDLED_DEPS) + $(PROTOC) -I$(<D) --cpp_out=. $< -%.grpc.pb.cc %.grpc.pb.h: src/tests/%.proto - $(PROTOC) -I$(^D) --grpc_out=. $^ \ +%.grpc.pb.cc %.grpc.pb.h: src/tests/%.proto $(BUNDLED_DEPS) + $(PROTOC) -I$(<D) --grpc_out=. $< \ --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN)
