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

diff --git a/Makefile b/Makefile
index b160065..3da8e03 100644
--- a/Makefile
+++ b/Makefile
@@ -11,18 +11,18 @@ rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/pollmgr.o rpc/thr_pool.o rpc/jsl_lo
 	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
 
-lock_demo=lock_demo.o lock_client.o
+lock_demo=lock_demo.o lock_client.o threaded_log.o rsm_client.o handle.o
 lock_demo : $(lock_demo) rpc/librpc.a
 
-lock_tester=lock_tester.o lock_client.o tprintf.o rsm_client.o handle.o lock_client_cache_rsm.o
+lock_tester=lock_tester.o lock_client.o threaded_log.o rsm_client.o handle.o
 lock_tester : $(lock_tester) rpc/librpc.a
 
-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_smain.o threaded_log.o handle.o rsm.o paxos.o config.o log.o lock_server.o
 lock_server : $(lock_server) rpc/librpc.a
 
-rsm_tester=rsm_tester.o rsmtest_client.o
+rsm_tester=rsm_tester.o rsmtest_client.o threaded_log.o
 rsm_tester: $(rsm_tester) rpc/librpc.a
 
 %.o: %.cc
@@ -31,7 +31,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)