Repository: mesos Updated Branches: refs/heads/master c31893148 -> fcd163ffc
Revert "Fixed build errors from v1 API." This reverts commit c31893148e6b3225f11044ec011bd7306debfac1. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fcd163ff Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fcd163ff Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fcd163ff Branch: refs/heads/master Commit: fcd163ffcc235fa3378042540d5e565885c9828a Parents: c318931 Author: Benjamin Hindman <[email protected]> Authored: Sun Aug 9 19:10:23 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Sun Aug 9 19:10:23 2015 -0700 ---------------------------------------------------------------------- src/Makefile.am | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fcd163ff/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 1ff4d94..9420031 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -234,16 +234,21 @@ 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. -%.pb.cc ../include/mesos/%.pb.h: $(top_srcdir)/include/mesos/%.proto +# +# 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) $(MKDIR_P) $(@D) $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^ - mv ../include/mesos/*.pb.cc . + -mv -f ../include/mesos/mesos.pb.cc $(@D) -v1/%.pb.cc ../include/mesos/v1/%.pb.h: $(V1_MESOS_PROTO) +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 ../include/mesos/v1/*.pb.cc $(@D) + -mv -f ../include/mesos/v1/mesos.pb.cc $(@D) authentication/%.pb.cc ../include/mesos/authentication/%.pb.h: $(AUTHENTICATION_PROTO) $(MKDIR_P) $(@D) @@ -339,7 +344,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/v1 \ + $(PROTOC) -I$(top_srcdir)/include/mesos \ $(PROTOCFLAGS) --python_out=python/interface/src/mesos/v1/interface $^ # All python protocol buffer code that imports from mesos.proto has
