X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=makefile;h=3b167e6a5c7fb6b102a876c4a3c5de58c2489d78;hp=1e4c1ec19a698680f3b6f0acfb1433d9ea0246ec;hb=010e49988a8b12f78053c387b3798763b4e8df18;hpb=efd90a1b8a9d3bbb1bdd8e6ae41b3462e7193fb2

diff --git a/makefile b/makefile
index 1e4c1ec..3b167e6 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
 
-RUNTIME_SRCS   := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c runtime/CuTest.c
-rcu_test_SRCS  := $(RUNTIME_SRCS)
-list_test_SRCS := $(RUNTIME_SRCS) struct/list.c
-ht_test_SRCS   := $(RUNTIME_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) test/CuTest.c
+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
+txn_test_SRCS  := $(TEST_SRCS) struct/ht.c txn/txn.c
 
 tests: $(TESTS) 
 
+txn: output/txn_test
+
 ###################################################################################################
 # Run the tests
 ###################################################################################################