More clean-ups

[invirt/third/libt4.git] / Makefile

diff --git a/Makefile b/Makefile
index caf3439..5ec634c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CXX ?= g++
 CC ?= g++
 EXTRA_TARGETS ?=
 
 CC ?= g++
 EXTRA_TARGETS ?=
 

-all: lock_demo lock_server lock_tester rsm_tester rpc/rpctest $(EXTRA_TARGETS)
+all: lock_server lock_tester rsm_tester rpc/rpctest $(EXTRA_TARGETS)

 
 rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/poll_mgr.o rpc/thread_pool.o
        rm -f $@
 
 rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/poll_mgr.o rpc/thread_pool.o
        rm -f $@

@@ -13,8 +13,6 @@ rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/poll_mgr.o rpc/thread_pool.o
 
 rpc/rpctest: rpc/rpctest.o threaded_log.o rpc/librpc.a t4.o
 
 
 rpc/rpctest: rpc/rpctest.o threaded_log.o rpc/librpc.a t4.o
 

-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 threaded_log.o rsm_client.o rpc/librpc.a t4.o
 
 lock_server : lock_smain.o threaded_log.o rsm.o paxos.o config.o log.o lock_server.o rpc/librpc.a t4.o
 lock_tester : lock_tester.o lock_client.o threaded_log.o rsm_client.o rpc/librpc.a t4.o
 
 lock_server : lock_smain.o threaded_log.o rsm.o paxos.o config.o log.o lock_server.o rpc/librpc.a t4.o

@@ -27,7 +25,7 @@ rsm_tester: rsm_tester.o rsmtest_client.o threaded_log.o rpc/librpc.a t4.o
 -include *.d
 -include rpc/*.d
 
 -include *.d
 -include rpc/*.d
 

-clean_files=rpc/rpctest rpc/*.o *.d rpc/*.d rpc/librpc.a *.o config *.log 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 rsm_tester

 .PHONY: clean $(EXTRA_TARGETS)
 clean: 
        rm -rf $(clean_files)
 .PHONY: clean $(EXTRA_TARGETS)
 clean: 
        rm -rf $(clean_files)