X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/dfe8486473094c0769fd1922329c3f0dfd8f43c0..c279db4240a3a3c30f069ab9dea8055cf94280da:/Makefile

diff --git a/Makefile b/Makefile
index b160065..caf3439 100644
--- a/Makefile
+++ b/Makefile
@@ -6,24 +6,20 @@ EXTRA_TARGETS ?=
 
 all: lock_demo lock_server lock_tester rsm_tester rpc/rpctest $(EXTRA_TARGETS)
 
-rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/pollmgr.o rpc/thr_pool.o rpc/jsl_log.o
+rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/poll_mgr.o rpc/thread_pool.o
 	rm -f $@
 	ar cq $@ $^
 	ranlib rpc/librpc.a
 
-rpc/rpctest: rpc/rpctest.o rpc/librpc.a
+rpc/rpctest: rpc/rpctest.o threaded_log.o rpc/librpc.a t4.o
 
-lock_demo=lock_demo.o lock_client.o
-lock_demo : $(lock_demo) rpc/librpc.a
+lock_demo : lock_demo.o lock_client.o threaded_log.o rsm_client.o rpc/librpc.a t4.o
 
-lock_tester=lock_tester.o lock_client.o tprintf.o rsm_client.o handle.o lock_client_cache_rsm.o
-lock_tester : $(lock_tester) rpc/librpc.a
+lock_tester : lock_tester.o lock_client.o threaded_log.o rsm_client.o rpc/librpc.a t4.o
 
-lock_server=lock_server.o lock_smain.o tprintf.o handle.o rsm.o paxos.o config.o log.o lock_server_cache_rsm.o
-lock_server : $(lock_server) rpc/librpc.a
+lock_server : lock_smain.o threaded_log.o rsm.o paxos.o config.o log.o lock_server.o rpc/librpc.a t4.o
 
-rsm_tester=rsm_tester.o rsmtest_client.o
-rsm_tester: $(rsm_tester) rpc/librpc.a
+rsm_tester: rsm_tester.o rsmtest_client.o threaded_log.o rpc/librpc.a t4.o
 
 %.o: %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@
@@ -31,7 +27,7 @@ rsm_tester: $(rsm_tester) rpc/librpc.a
 -include *.d
 -include rpc/*.d
 
-clean_files=rpc/rpctest rpc/*.o *.d rpc/*.d rpc/librpc.a *.o lock_server lock_tester lock_demo rsm_tester
+clean_files=rpc/rpctest rpc/*.o *.d rpc/*.d rpc/librpc.a *.o config *.log lock_server lock_tester lock_demo rsm_tester
 .PHONY: clean $(EXTRA_TARGETS)
 clean: 
 	rm -rf $(clean_files)