C++11y allows us to eliminate some boilerplate!

[invirt/third/libt4.git] / Makefile

diff --git a/Makefile b/Makefile
index e2a20d9..5dd06c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,23 @@
-CXXFLAGS ?= -g -MMD -Werror -I. -std=c++11
+CXXFLAGS ?= -g -MMD -Werror -I. -std=c++1y
 LDFLAGS ?= 
 CXX ?= g++
 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/marshall.o rpc/connection.o rpc/pollmgr.o rpc/thr_pool.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 threaded_log.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 threaded_log.o rsm_client.o handle.o
-lock_demo : $(lock_demo) rpc/librpc.a
+lock_tester : lock_tester.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 handle.o
-lock_tester : $(lock_tester) 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
 
-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 threaded_log.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 +25,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 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)