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 2011/06/05 11:05:13 UTC
svn commit: r1132234 [1/3] - in /incubator/mesos/trunk: ./ src/ src/config/
src/event_history/ src/tests/
Author: benh
Date: Sun Jun 5 09:05:13 2011
New Revision: 1132234
URL: http://svn.apache.org/viewvc?rev=1132234&view=rev
Log:
Merging back into master, adding --with_included_sqlite as
a new option to ./configure.
Modified:
incubator/mesos/trunk/Makefile.in
incubator/mesos/trunk/configure
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/configure.template.macosx
incubator/mesos/trunk/configure.template.ubuntu-hardy-64
incubator/mesos/trunk/configure.template.ubuntu-karmic-64
incubator/mesos/trunk/configure.template.ubuntu-lucid-64
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/config/config.hpp.in
incubator/mesos/trunk/src/event_history/event_logger.cpp
incubator/mesos/trunk/src/tests/Makefile.in
Modified: incubator/mesos/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/Makefile.in?rev=1132234&r1=1132233&r2=1132234&view=diff
==============================================================================
--- incubator/mesos/trunk/Makefile.in (original)
+++ incubator/mesos/trunk/Makefile.in Sun Jun 5 09:05:13 2011
@@ -11,13 +11,18 @@ OS_NAME = @OS_NAME@
MESOS_HOME = @prefix@/mesos
+WITH_INCLUDED_SQLITE = @WITH_INCLUDED_SQLITE@
+
WITH_INCLUDED_ZOOKEEPER = @WITH_INCLUDED_ZOOKEEPER@
LIBPROCESS = third_party/libprocess
-PROTOBUF = third_party/protobuf-2.3.0
+
+SQLITE = third_party/sqlite-3.6.23.1
+
+ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
+
GLOG = third_party/glog-0.3.1
GMOCK = third_party/gmock-1.5.0
-ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
default: all
@@ -27,14 +32,15 @@ src: third_party
third_party:
$(MAKE) -C $(LIBPROCESS)
- $(MAKE) -C $(PROTOBUF)
$(MAKE) -C $(GLOG)
$(MAKE) -C $(GMOCK)
+ifeq ($(WITH_INCLUDED_SQLITE),1)
+ $(MAKE) -C $(SQLITE)
+endif
ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
$(MAKE) -C $(ZOOKEEPER)
endif
-# TODO(benh): Install generated C++ header files.
install:
if test ! -d $(MESOS_HOME)/bin; \
then mkdir -p $(MESOS_HOME)/bin; \
@@ -81,11 +87,13 @@ dist:
$(error unimplemented)
distclean:
- $(MAKE) -C src clean # TODO(benh): Support an internal distclean.
+ $(MAKE) -C src clean
$(MAKE) -C $(LIBPROCESS) distclean
- $(MAKE) -C $(PROTOBUF) distclean
$(MAKE) -C $(GLOG) distclean
$(MAKE) -C $(GMOCK) distclean
+ifeq ($(WITH_INCLUDED_SQLITE),1)
+ $(MAKE) -C $(SQLITE) distclean
+endif
ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
$(MAKE) -C $(ZOOKEEPER) distclean
endif
@@ -117,9 +125,11 @@ all: src
clean:
$(MAKE) -C src clean
$(MAKE) -C $(LIBPROCESS) clean
- $(MAKE) -C $(PROTOBUF) clean
$(MAKE) -C $(GLOG) clean
$(MAKE) -C $(GMOCK) clean
+ifeq ($(WITH_INCLUDED_SQLITE),1)
+ $(MAKE) -C $(SQLITE) clean
+endif
ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
$(MAKE) -C $(ZOOKEEPER) clean
endif