More clean-ups

[invirt/third/libt4.git] / Makefile

diff --git a/Makefile b/Makefile
index b160065..6bd396f 100644 (file)
--- 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
 
        ar cq $@ $^
        ranlib rpc/librpc.a
 

-rpc/rpctest: rpc/rpctest.o rpc/librpc.a
+rpc/rpctest: rpc/rpctest.o tprintf.o rpc/librpc.a

 
 

-lock_demo=lock_demo.o lock_client.o
+lock_demo=lock_demo.o lock_client.o tprintf.o rsm_client.o handle.o

 lock_demo : $(lock_demo) rpc/librpc.a
 
 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 tprintf.o rsm_client.o handle.o

 lock_tester : $(lock_tester) rpc/librpc.a
 
 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 tprintf.o handle.o rsm.o paxos.o config.o log.o lock_server.o

 lock_server : $(lock_server) rpc/librpc.a
 
 lock_server : $(lock_server) rpc/librpc.a
 

-rsm_tester=rsm_tester.o rsmtest_client.o
+rsm_tester=rsm_tester.o rsmtest_client.o tprintf.o

 rsm_tester: $(rsm_tester) rpc/librpc.a
 
 %.o: %.cc
 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
 
 -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)
 .PHONY: clean $(EXTRA_TARGETS)
 clean: 
        rm -rf $(clean_files)