You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2016/07/05 19:00:29 UTC
[09/12] mesos git commit: Libprocess: Prepare for standalone
compilation.
Libprocess: Prepare for standalone compilation.
Review: https://reviews.apache.org/r/47928/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/722713ad
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/722713ad
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/722713ad
Branch: refs/heads/master
Commit: 722713ad6890bdf0714047a4f2927d32d6ed88d0
Parents: 07e46b6
Author: Till Toenshoff <to...@me.com>
Authored: Tue Jul 5 16:30:02 2016 +0200
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Tue Jul 5 14:24:23 2016 -0400
----------------------------------------------------------------------
3rdparty/libprocess/Makefile.am | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/722713ad/3rdparty/libprocess/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am
index 1af1c40..20130c4 100644
--- a/3rdparty/libprocess/Makefile.am
+++ b/3rdparty/libprocess/Makefile.am
@@ -23,19 +23,22 @@ LIBPROCESS_BUILD_DIR=@abs_builddir@
# the header files during installation.
SUBDIRS = . include
+BUNDLED_DIR = ..
+
include ../versions.am
STOUT = ../stout
-BOOST = ../boost-$(BOOST_VERSION)
-ELFIO = ../elfio-$(ELFIO_VERSION)
-GLOG = ../glog-$(GLOG_VERSION)
-GMOCK = ../gmock-$(GMOCK_VERSION)
-GPERFTOOLS = ../gperftools-$(GPERFTOOLS_VERSION)
+
+BOOST = $(BUNDLED_DIR)/boost-$(BOOST_VERSION)
+ELFIO = $(BUNDLED_DIR)/elfio-$(ELFIO_VERSION)
+GLOG = $(BUNDLED_DIR)/glog-$(GLOG_VERSION)
+GMOCK = $(BUNDLED_DIR)/gmock-$(GMOCK_VERSION)
+GPERFTOOLS = $(BUNDLED_DIR)/gperftools-$(GPERFTOOLS_VERSION)
GTEST = $(GMOCK)/gtest
-HTTP_PARSER = ../http-parser-$(HTTP_PARSER_VERSION)
-LIBEV = ../libev-$(LIBEV_VERSION)
-PICOJSON = ../picojson-$(PICOJSON_VERSION)
-PROTOBUF = ../protobuf-$(PROTOBUF_VERSION)
+HTTP_PARSER = $(BUNDLED_DIR)/http-parser-$(HTTP_PARSER_VERSION)
+LIBEV = $(BUNDLED_DIR)/libev-$(LIBEV_VERSION)
+PICOJSON = $(BUNDLED_DIR)/picojson-$(PICOJSON_VERSION)
+PROTOBUF = $(BUNDLED_DIR)/protobuf-$(PROTOBUF_VERSION)
# Dependencies for all-local.
BUNDLED_DEPS = # Initialize BUNDLED_DEPENDENCIES so we can add to it.
@@ -43,7 +46,7 @@ BUNDLED_DEPS = # Initialize BUNDLED_DEPENDENCIES so we can add to it.
# Ensure bundled software is build properly.
%-stamp:
- @cd .. && $(MAKE) $(AM_MAKEFLAGS) $(@F)
+ @cd $(BUNDLED_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
if WITH_BUNDLED_BOOST
BOOST_INCLUDE_FLAGS = -isystem $(BOOST)
@@ -67,7 +70,7 @@ endif
if WITH_BUNDLED_GMOCK
GMOCK_INCLUDE_FLAGS = -I$(GMOCK)/include
GTEST_INCLUDE_FLAGS = -I$(GTEST)/include
-LIB_GMOCK = ../libgmock.la
+LIB_GMOCK = $(BUNDLED_DIR)/libgmock.la
$(LIB_GMOCK): $(GMOCK)-build-stamp
BUNDLED_DEPS += $(GMOCK)-build-stamp
endif
@@ -81,7 +84,7 @@ endif
if WITH_BUNDLED_HTTP_PARSER
HTTP_PARSER_INCLUDE_FLAGS = -I$(HTTP_PARSER)
-LIB_HTTP_PARSER = ../libry_http_parser.la
+LIB_HTTP_PARSER = $(BUNDLED_DIR)/libry_http_parser.la
$(LIB_HTTP_PARSER): $(HTTP_PARSER)-build-stamp
BUNDLED_DEPS += $(HTTP_PARSER)-build-stamp
else