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 10:16:54 UTC
svn commit: r1131987 [2/45] - in /incubator/mesos/trunk: ./ src/
src/third_party/boost-1.37.0/ src/third_party/boost-1.37.0/boost/
src/third_party/boost-1.37.0/boost/bind/
src/third_party/boost-1.37.0/boost/config/
src/third_party/boost-1.37.0/boost/co...
Modified: incubator/mesos/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/.gitignore?rev=1131987&r1=1131986&r2=1131987&view=diff
==============================================================================
--- incubator/mesos/trunk/.gitignore (original)
+++ incubator/mesos/trunk/.gitignore Sun Jun 5 08:12:18 2011
@@ -38,36 +38,36 @@ src/webui/master/swig/master_wrap.h
src/webui/slave/swig/slave.py
src/webui/slave/swig/slave_wrap.cpp
src/webui/slave/swig/slave_wrap.h
-src/third_party/glog-0.3.1/demangle_unittest
-src/third_party/glog-0.3.1/configure
-src/third_party/glog-0.3.1/src/config.h.in
-src/third_party/glog-0.3.1/libglog.pc
-src/third_party/glog-0.3.1/logging_striptest0
-src/third_party/glog-0.3.1/logging_striptest10
-src/third_party/glog-0.3.1/logging_striptest2
-src/third_party/glog-0.3.1/logging_unittest
-src/third_party/glog-0.3.1/signalhandler_unittest
-src/third_party/glog-0.3.1/src/glog/logging.h
-src/third_party/glog-0.3.1/src/glog/raw_logging.h
-src/third_party/glog-0.3.1/src/glog/stl_logging.h
-src/third_party/glog-0.3.1/src/glog/vlog_is_on.h
-src/third_party/glog-0.3.1/src/stamp-h1
-src/third_party/glog-0.3.1/stacktrace_unittest
-src/third_party/glog-0.3.1/stl_logging_unittest
-src/third_party/glog-0.3.1/symbolize_unittest
-src/third_party/glog-0.3.1/utilities_unittest
-src/third_party/libprocess/third_party/libev/stamp-h1
-src/third_party/glog-0.3.1/src/config.h
-src/third_party/gtest-1.5.0/configure
-src/third_party/gtest-1.5.0/build-aux/config.h
-src/third_party/gtest-1.5.0/build-aux/stamp-h1
-src/third_party/gtest-1.5.0/scripts/gtest-config
-src/third_party/libprocess/third_party/libev-3.8/config.h
-src/third_party/zookeeper-3.3.1/src/c/cli_mt
-src/third_party/zookeeper-3.3.1/src/c/cli_st
-src/third_party/zookeeper-3.3.1/src/c/config.h
-src/third_party/zookeeper-3.3.1/src/c/load_gen
-src/third_party/zookeeper-3.3.1/src/c/stamp-h1
+third_party/glog-0.3.1/demangle_unittest
+third_party/glog-0.3.1/configure
+third_party/glog-0.3.1/src/config.h.in
+third_party/glog-0.3.1/libglog.pc
+third_party/glog-0.3.1/logging_striptest0
+third_party/glog-0.3.1/logging_striptest10
+third_party/glog-0.3.1/logging_striptest2
+third_party/glog-0.3.1/logging_unittest
+third_party/glog-0.3.1/signalhandler_unittest
+third_party/glog-0.3.1/src/glog/logging.h
+third_party/glog-0.3.1/src/glog/raw_logging.h
+third_party/glog-0.3.1/src/glog/stl_logging.h
+third_party/glog-0.3.1/src/glog/vlog_is_on.h
+third_party/glog-0.3.1/src/stamp-h1
+third_party/glog-0.3.1/stacktrace_unittest
+third_party/glog-0.3.1/stl_logging_unittest
+third_party/glog-0.3.1/symbolize_unittest
+third_party/glog-0.3.1/utilities_unittest
+third_party/libprocess/third_party/libev/stamp-h1
+third_party/glog-0.3.1/src/config.h
+third_party/gtest-1.5.0/configure
+third_party/gtest-1.5.0/build-aux/config.h
+third_party/gtest-1.5.0/build-aux/stamp-h1
+third_party/gtest-1.5.0/scripts/gtest-config
+third_party/libprocess/third_party/libev-3.8/config.h
+third_party/zookeeper-3.3.1/src/c/cli_mt
+third_party/zookeeper-3.3.1/src/c/cli_st
+third_party/zookeeper-3.3.1/src/c/config.h
+third_party/zookeeper-3.3.1/src/c/load_gen
+third_party/zookeeper-3.3.1/src/c/stamp-h1
src/alltests
src/conf/mesos.conf
src/cpp-test-executor
Modified: incubator/mesos/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/Makefile.in?rev=1131987&r1=1131986&r2=1131987&view=diff
==============================================================================
--- incubator/mesos/trunk/Makefile.in (original)
+++ incubator/mesos/trunk/Makefile.in Sun Jun 5 08:12:18 2011
@@ -1,13 +1,30 @@
# Makefile.
-MESOS_HOME = @prefix@/mesos
SHELL = '/bin/sh'
+MESOS_HOME = @prefix@/mesos
+
+WITH_INCLUDED_ZOOKEEPER = @WITH_INCLUDED_ZOOKEEPER@
+
+ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
+
+GLOG = third_party/glog-0.3.1
+GTEST = third_party/gtest-1.5.0
+
+
default: all
-src:
+src: third_party
$(MAKE) -C src
+third_party:
+ $(MAKE) -C third_party/libprocess
+ $(MAKE) -C $(GLOG)
+ $(MAKE) -C $(GTEST)
+ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
+ $(MAKE) -C $(ZOOKEEPER)
+endif
+
install:
if test ! -d $(MESOS_HOME); \
then mkdir $(MESOS_HOME); \
@@ -22,7 +39,7 @@ install:
if test ! -d $(MESOS_HOME)/third_party; \
then mkdir $(MESOS_HOME)/third_party; \
fi
- rsync -avz src/third_party/bottle-0.5.6 $(MESOS_HOME)/third_party
+ rsync -avz third_party/bottle-0.5.6 $(MESOS_HOME)/third_party
uninstall:
$(error unimplemented)
@@ -42,11 +59,16 @@ CTAGS = ctags
ctags:
cd src; $(CTAGS) ../include/*.h ../include/*.hpp *.h *.c *.hpp *.cpp
-#TODO(*): make the above use conditional to handle old-school UNIX style ctags too
+#TODO(*): make the above use conditionals to handle old-school UNIX style ctags too.
#cd src; ctags --typedefs-and-c++ -I -members --declarations ../include/*.h ../include/*.c ../include/*.hpp ../include/*.cpp -o tags
-
clean:
$(MAKE) -C src clean
+ $(MAKE) -C third_party/libprocess clean
+ $(MAKE) -C $(GLOG) clean
+ $(MAKE) -C $(GTEST) clean
+ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
+ $(MAKE) -C $(ZOOKEEPER) clean
+endif
-.PHONY: default src install uninstall dist all clean
+.PHONY: default src third_party install uninstall dist all clean