More marshalling simplification

[invirt/third/libt4.git] / Makefile

diff --git a/Makefile b/Makefile
index 6bd396f..5c2080b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,24 +6,20 @@ EXTRA_TARGETS ?=
 
 all: lock_demo lock_server lock_tester rsm_tester rpc/rpctest $(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/pollmgr.o rpc/thr_pool.o

        rm -f $@
        ar cq $@ $^
        ranlib rpc/librpc.a
 
        rm -f $@
        ar cq $@ $^
        ranlib rpc/librpc.a
 

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

 
 

-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.o lock_client.o threaded_log.o rsm_client.o handle.o rpc/librpc.a

 
 

-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.o lock_client.o threaded_log.o rsm_client.o handle.o rpc/librpc.a

 
 

-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_smain.o threaded_log.o handle.o rsm.o paxos.o config.o log.o lock_server.o rpc/librpc.a

 
 

-rsm_tester=rsm_tester.o rsmtest_client.o tprintf.o
-rsm_tester: $(rsm_tester) rpc/librpc.a
+rsm_tester: rsm_tester.o rsmtest_client.o threaded_log.o rpc/librpc.a

 
 %.o: %.cc
        $(CXX) $(CXXFLAGS) -c $< -o $@
 
 %.o: %.cc
        $(CXX) $(CXXFLAGS) -c $< -o $@