You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/08/10 03:51:12 UTC
mesos git commit: Fixed build errors from v1 API.
Repository: mesos
Updated Branches:
refs/heads/master 888e56e23 -> c31893148
Fixed build errors from v1 API.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c3189314
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c3189314
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c3189314
Branch: refs/heads/master
Commit: c31893148e6b3225f11044ec011bd7306debfac1
Parents: 888e56e
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sun Aug 9 18:50:55 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Aug 9 18:50:55 2015 -0700
----------------------------------------------------------------------
src/Makefile.am | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c3189314/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 9420031..1ff4d94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,21 +234,16 @@ 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)
+%.pb.cc ../include/mesos/%.pb.h: $(top_srcdir)/include/mesos/%.proto
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^
- -mv -f ../include/mesos/mesos.pb.cc $(@D)
+ mv ../include/mesos/*.pb.cc .
-v1/mesos.pb.cc ../include/mesos/v1/mesos.pb.h: $(V1_MESOS_PROTO)
+v1/%.pb.cc ../include/mesos/v1/%.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)
+ mv ../include/mesos/v1/*.pb.cc $(@D)
authentication/%.pb.cc ../include/mesos/authentication/%.pb.h: $(AUTHENTICATION_PROTO)
$(MKDIR_P) $(@D)
@@ -344,7 +339,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