svn commit: r1131769 - /incubator/mesos/trunk/src/Makefile.in

[be...@apache.org]

Author: benh
Date: Sun Jun  5 05:27:34 2011
New Revision: 1131769

URL: http://svn.apache.org/viewvc?rev=1131769&view=rev
Log:
Reference javac and jar through JAVA_HOME

Modified:
    incubator/mesos/trunk/src/Makefile.in

Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1131769&r1=1131768&r2=1131769&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun  5 05:27:34 2011
@@ -20,15 +20,11 @@ RUBY_HEADERS = @RUBY_HEADERS@
 WITH_WEBUI = @WITH_WEBUI@
 WEBUI_FLAGS = @WEBUI_FLAGS@
 
-LOCAL_ZOOKEEPER = @LOCAL_ZOOKEEPER@
-
 LIBEV = third_party/libprocess/third_party/libev-3.8
 
 GLOG = third_party/glog-0.3.0
 GTEST = third_party/gtest-1.4.0-patched
 
-ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
-
 # Ensure that we get better debugging info.
 CFLAGS += -g
 CXXFLAGS += -g
@@ -59,12 +55,6 @@ CXXFLAGS += -I$(GTEST)/include
 LDFLAGS += -L$(GLOG)/.libs
 LDFLAGS += -L$(GTEST)/lib/.libs
 
-# Add local ZooKeeper to include and lib paths if necessary.
-ifeq ($(LOCAL_ZOOKEEPER),yes)
-  CXXFLAGS += -I$(ZOOKEEPER)/include -I$(ZOOKEEPER)/generated
-  LDFLAGS += -L$(ZOOKEEPER)/.libs
-endif
-
 # Add dependency tracking to CFLAGS, CXXFLAGS.
 CFLAGS += -MMD -MP
 CXXFLAGS += -MMD -MP
@@ -77,11 +67,8 @@ CXXFLAGS += -DBUILD_DATE="\"$$(date '+%Y
 CFLAGS += -DBUILD_USER="\"$$USER\""
 CXXFLAGS += -DBUILD_USER="\"$$USER\""
 
-# Add libev to LDFLAGS.
-LDFLAGS += -L$(LIBEV)/.libs
-
 # Add libev, libprocess, pthread, and dl to LIBS.
-LIBS += -lglog -lgtest -lprocess -lev -lpthread -ldl -lzookeeper_st
+LIBS += -lglog -lgtest -lprocess -lev -lpthread -ldl
 
 NEXUS_EXES = nexus-master nexus-slave nexus-local nexus-launcher alltests \
 	     test-framework test-executor cpp-test-framework cpp-test-executor \
@@ -102,7 +89,7 @@ NEXUS_LIBS = $(SCHED_LIB) $(EXEC_LIB) $(
 MASTER_OBJ = master.o allocator_factory.o simple_allocator.o
 SLAVE_OBJ = slave.o launcher.o isolation_module_factory.o \
 	    process_based_isolation_module.o
-COMMON_OBJ = fatal.o hash_pid.o messages.o lock.o master_detector.o url_processor.o ft_messaging.o zookeeper.o
+COMMON_OBJ = fatal.o hash_pid.o lock.o messages.o
 EXEC_LIB_OBJ = nexus_exec.o
 SCHED_LIB_OBJ = nexus_sched.o nexus_local.o params.o
 TEST_OBJ = tests/main.o tests/test_master.o tests/test_resources.o
@@ -221,10 +208,8 @@ ruby: $(RUBY_LIB)
 
 swig/java/nexus.jar: $(JAVA_LIB)
 ifdef JAVA_HOME
-	javac -sourcepath swig/java -d swig/java swig/java/nexus/*.java
-#	patch -N swig/java/nexus/nexusJNI.java < swig/java/nexusJNI.java.patch1 || echo -n
-#	patch swig/java/nexus/nexusJNI.java < swig/java/nexusJNI.java.patch2 || echo -n
-	jar cf $@ -C swig/java nexus
+	$(JAVA_HOME)/bin/javac -sourcepath swig/java -d swig/java swig/java/nexus/*.java
+	$(JAVA_HOME)/bin/jar cf $@ -C swig/java nexus
 endif
 
 $(JAVA_LIB): swig/nexus.i $(NEXUS_LIB)
@@ -237,12 +222,12 @@ endif
 
 swig/java/TestFramework.class: $(JAVA_LIB) swig/java/nexus.jar swig/java/TestFramework.java
 ifdef JAVA_HOME
-	javac -cp swig/java/nexus.jar -sourcepath swig/java -d swig/java swig/java/TestFramework.java
+	$(JAVA_HOME)/bin/javac -cp swig/java/nexus.jar -sourcepath swig/java -d swig/java swig/java/TestFramework.java
 endif
 
 swig/java/TestExecutor.class: $(JAVA_LIB) swig/java/nexus.jar swig/java/TestExecutor.java
 ifdef JAVA_HOME
-	javac -cp swig/java/nexus.jar -sourcepath swig/java -d swig/java swig/java/TestExecutor.java
+	$(JAVA_HOME)/bin/javac -cp swig/java/nexus.jar -sourcepath swig/java -d swig/java swig/java/TestExecutor.java
 endif
 
 $(PYTHON_LIB): swig/nexus.i $(NEXUS_LIB)
@@ -264,9 +249,6 @@ third_party:
 	$(MAKE) -C third_party/libprocess
 	$(MAKE) -C $(GLOG)
 	$(MAKE) -C $(GTEST)
-ifeq ($(LOCAL_ZOOKEEPER),yes)
-	$(MAKE) -C $(ZOOKEEPER)
-endif
 
 all: third_party $(NEXUS_LIBS) $(NEXUS_EXES) java python ruby
 
@@ -274,9 +256,6 @@ clean:
 	$(MAKE) -C third_party/libprocess clean
 	$(MAKE) -C $(GLOG) clean
 	$(MAKE) -C $(GTEST) clean
-ifeq ($(LOCAL_ZOOKEEPER),yes)
-	$(MAKE) -C $(ZOOKEEPER) clean
-endif
 	rm -f $(patsubst %.o, %.d, $(ALL_OBJ))
 	rm -f $(ALL_OBJ)
 	rm -f $(NEXUS_LIBS)
@@ -308,6 +287,5 @@ endif
 	rm -f webui/slave/swig/slave_wrap.d
 	rm -f webui/slave/swig/slave.py
 	rm -f webui/slave/swig/slave.pyc
-	rm -f TAGS
 
 .PHONY: default third_party all clean java python ruby test