X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=makefile;h=939f8dd1bccb12c96ae5227ab73aeaafe08364bf;hp=a59466f71cd5fa3d01a302ce704a0899908669aa;hb=af2000653f50ce43e94bfd260ce47e4b53ab2222;hpb=4a7804bd08c790fc3c4233312e4b485c3302fe02

diff --git a/makefile b/makefile
index a59466f..939f8dd 100644
--- a/makefile
+++ b/makefile
@@ -6,18 +6,22 @@
 # Makefile for building programs with whole-program interfile optimization 
 ###################################################################################################
 OPT	   := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 -m64 -fnested-functions $(OPT) #-DENABLE_TRACE 
+CFLAGS := -g -Wall -Werror -std=c99 -m64 -fnested-functions #$(OPT) #-DENABLE_TRACE 
 INCS   := $(addprefix -I, include)
 TESTS  := output/rcu_test output/list_test output/ht_test
-EXES   := $(TESTS)
+EXES   := $(TESTS) output/txn_test
 
-UTIL_SRCS      := util/nbd.c util/rcu.c util/lwt.c util/CuTest.c util/mem.c
-rcu_test_SRCS  := $(UTIL_SRCS)
-list_test_SRCS := $(UTIL_SRCS) struct/list.c
-ht_test_SRCS   := $(UTIL_SRCS) struct/ht.c struct/ht_test.c
+RUNTIME_SRCS   := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c 
+TEST_SRCS      := $(RUNTIME_SRCS) 
+rcu_test_SRCS  := $(TEST_SRCS)
+list_test_SRCS := $(TEST_SRCS) struct/list.c
+ht_test_SRCS   := $(TEST_SRCS) struct/ht.c test/ht_test.c test/CuTest.c
+txn_test_SRCS  := $(TEST_SRCS) struct/ht.c txn/txn.c
 
 tests: $(TESTS) 
 
+txn: output/txn_test
+
 ###################################################################################################
 # Run the tests
 ###################################################################################################