Repository: mesos Updated Branches: refs/heads/master ed4cec8f4 -> 7d1667333
Revised fix for protoc build issues. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7d166733 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7d166733 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7d166733 Branch: refs/heads/master Commit: 7d16673334360536803576e71eccaf332f2aa5f7 Parents: ed4cec8 Author: Benjamin Hindman <[email protected]> Authored: Mon Aug 10 14:09:08 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 10 17:28:29 2015 -0700 ---------------------------------------------------------------------- src/Makefile.am | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/7d166733/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 9420031..85c9160 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -169,7 +169,7 @@ OVERSUBSCRIPTION_PROTO = \ $(top_srcdir)/include/mesos/slave/oversubscription.proto CXX_PROTOS = \ - mesos.pb.cc \ + ../include/mesos/mesos.pb.cc \ ../include/mesos/mesos.pb.h \ authentication/authentication.pb.cc \ ../include/mesos/authentication/authentication.pb.h \ @@ -189,7 +189,7 @@ CXX_PROTOS = \ ../include/mesos/slave/isolator.pb.h \ slave/oversubscription.pb.cc \ ../include/mesos/slave/oversubscription.pb.h \ - v1/mesos.pb.cc \ + ../include/mesos/v1/mesos.pb.cc \ ../include/mesos/v1/mesos.pb.h \ v1/scheduler/scheduler.pb.cc \ ../include/mesos/v1/scheduler/scheduler.pb.h @@ -234,21 +234,14 @@ CLEANFILES += $(REGISTRY_PROTOS) # Targets for generating protocol buffer code. # For the include headers, place the header files in the include # directory and leave the cc files in src. -# -# TODO(benh): In certain circumstances below we need to do '-mv' -# instead of just 'mv' because the way we have our dependencies -# currently set up 'make' actually attempts to run the 'mv' command -# twice which causes the second invocation to fail because the file no -# longer exists (because it's already been moved). -mesos.pb.cc ../include/mesos/mesos.pb.h: $(MESOS_PROTO) +../include/mesos/mesos.pb.cc ../include/mesos/mesos.pb.h: $(MESOS_PROTO) $(MKDIR_P) $(@D) $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^ - -mv -f ../include/mesos/mesos.pb.cc $(@D) -v1/mesos.pb.cc ../include/mesos/v1/mesos.pb.h: $(V1_MESOS_PROTO) +../include/mesos/v1/mesos.pb.cc ../include/mesos/v1/mesos.pb.h: $(V1_MESOS_PROTO) $(MKDIR_P) $(@D) + $(MKDIR_P) ../include/mesos/v1 $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^ - -mv -f ../include/mesos/v1/mesos.pb.cc $(@D) authentication/%.pb.cc ../include/mesos/authentication/%.pb.h: $(AUTHENTICATION_PROTO) $(MKDIR_P) $(@D) @@ -344,7 +337,7 @@ python/interface/src/mesos/interface/mesos_pb2.py: $(MESOS_PROTO) python/interface/src/mesos/v1/interface/mesos_pb2.py: $(V1_MESOS_PROTO) $(MKDIR_P) $(@D) - $(PROTOC) -I$(top_srcdir)/include/mesos \ + $(PROTOC) -I$(top_srcdir)/include/mesos/v1 \ $(PROTOCFLAGS) --python_out=python/interface/src/mesos/v1/interface $^ # All python protocol buffer code that imports from mesos.proto has
