You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2017/12/08 00:25:32 UTC

mesos git commit: Fixed build dependency for `protobuf_tests.proto`.

Repository: mesos
Updated Branches:
  refs/heads/master 54e03f3ce -> 49ca9c7d8


Fixed build dependency for `protobuf_tests.proto`.

The protobuf hpp and cpp files for `protobuf_tests.proto` should be
built after `BUNDLED_DEPS`, not within it.

Review: https://reviews.apache.org/r/62777/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/49ca9c7d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/49ca9c7d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/49ca9c7d

Branch: refs/heads/master
Commit: 49ca9c7d88d8133d606b865c22d92052b4a71f3c
Parents: 54e03f3
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
Authored: Fri Dec 8 00:40:38 2017 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Fri Dec 8 01:19:31 2017 +0100

----------------------------------------------------------------------
 3rdparty/stout/Makefile.am | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/49ca9c7d/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index bcf3842..b131884 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -119,8 +119,8 @@ endif
 PROTOCFLAGS = -I$(srcdir)/tests
 
 # Targets for generating C++ protocol buffer code.
-protobuf_tests.pb.cc protobuf_tests.pb.h: tests/protobuf_tests.proto
-	$(PROTOC) $(PROTOCFLAGS) --cpp_out=$(builddir) $^
+%.pb.cc %.pb.h: tests/%.proto $(BUNDLED_DEPS)
+	$(PROTOC) $(PROTOCFLAGS) --cpp_out=$(builddir) $<
 
 # Tests for stout.
 check_PROGRAMS = stout-tests
@@ -212,15 +212,18 @@ endif
 
 BUILT_SOURCES = $(BUNDLED_DEPS)
 
+PROTOBUF_TESTS_PROTOS =			\
+  protobuf_tests.pb.cc			\
+  protobuf_tests.pb.h
+
 BUILT_SOURCES +=			\
-  protobuf_tests.pb.cc
+  $(PROTOBUF_TESTS_PROTOS)
 
 nodist_stout_tests_SOURCES =		\
-  protobuf_tests.pb.cc
+  $(PROTOBUF_TESTS_PROTOS)
 
 CLEANFILES =				\
-  protobuf_tests.pb.cc			\
-  protobuf_tests.pb.h
+  $(PROTOBUF_TESTS_PROTOS)
 
 # We use a check-local target for now to avoid the parallel test
 # runner that ships with newer versions of autotools.