X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/61809b48ade4c21b1b01931d520aa2abc7507032..a4175b2e216a20b86cc872dea8a08005c60617a5:/Makefile diff --git a/Makefile b/Makefile index edf9fd0..4a239bc 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,11 @@ -CXXFLAGS = -g -MMD -Wall -I. -I./rpc -LDFLAGS = -L. -L/usr/local/lib -LDLIBS = -lpthread -LDLIBS += $(shell test -f `gcc -print-file-name=librt.so` && echo -lrt) -LDLIBS += $(shell test -f `gcc -print-file-name=libdl.so` && echo -ldl) +CXXFLAGS = -g -MMD -Werror -I. -std=c++11 +LDFLAGS = CXX = g++ CC = g++ all: lock_demo lock_server lock_tester rsm_tester rpc/rpctest -rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/pollmgr.o rpc/thr_pool.o rpc/jsl_log.o gettime.o +rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/pollmgr.o rpc/thr_pool.o rpc/jsl_log.o rm -f $@ ar cq $@ $^ ranlib rpc/librpc.a @@ -18,10 +15,10 @@ rpc/rpctest: rpc/rpctest.o rpc/librpc.a lock_demo=lock_demo.o lock_client.o lock_demo : $(lock_demo) rpc/librpc.a -lock_tester=lock_tester.o lock_client.o mutex.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_client_cache_rsm.o lock_tester : $(lock_tester) rpc/librpc.a -lock_server=lock_server.o lock_smain.o mutex.o tprintf.o handle.o rsm.o paxos.o config.o log.o lock_server_cache_rsm.o +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_server) rpc/librpc.a rsm_tester=rsm_tester.o rsmtest_client.o