Repository: mesos
Updated Branches:
  refs/heads/master 0ba6b89b7 -> 066069dde


Forced mesos_pb2 to be generated in a flat fashion.

This fixes the regression caused by https://reviews.apache.org/r/23704/

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


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

Branch: refs/heads/master
Commit: 066069ddeac9fb389e0949082b4a781fd3b26f83
Parents: 0ba6b89
Author: Thomas Rampelberg <[email protected]>
Authored: Sat Aug 2 07:54:22 2014 -0700
Committer: Niklas Q. Nielsen <[email protected]>
Committed: Sat Aug 2 07:54:22 2014 -0700

----------------------------------------------------------------------
 src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/066069dd/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 04be4e0..c741cdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,7 +200,8 @@ java/generated/org/apache/mesos/scheduler/Protos.java: 
$(SCHEDULER_PROTO)
 
 python/interface/src/mesos/interface/mesos_pb2.py: $(MESOS_PROTO)
        $(MKDIR_P) $(@D)
-       $(PROTOC) $(PROTOCFLAGS) 
--python_out=python/interface/src/mesos/interface $^
+       $(PROTOC) -I$(top_srcdir)/include/mesos                         \
+               $(PROTOCFLAGS) 
--python_out=python/interface/src/mesos/interface $^
 
 python/interface/src/mesos/interface/containerizer_pb2.py: 
$(CONTAINERIZER_PROTO)
        $(MKDIR_P) $(@D)

Reply via email to