X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/c279db4240a3a3c30f069ab9dea8055cf94280da..3efa02fb3a9f0a0566a7f3c99a1efb94e30ea4a6:/Makefile

diff --git a/Makefile b/Makefile
index caf3439..5dd06c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-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/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
 
-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
@@ -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
 
-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)