X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=makefile;fp=makefile;h=ebcaae63cf06fe3e60eefca8c779fbe5efc0b532;hp=9b71cf718dcab10667557e65818ac0c766516d6a;hb=a03cf3b0c40e6c3b8b4877b49a64288cb3fcb919;hpb=e592519ef19f890e551c27f47ef8b773bb4860da

diff --git a/makefile b/makefile
index 9b71cf7..ebcaae6 100644
--- a/makefile
+++ b/makefile
@@ -5,14 +5,15 @@
 # Makefile for building programs with whole-program interfile optimization
 ###################################################################################################
 OPT	   := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 $(OPT) -m64 -DTEST_STRING_KEYS #-DNBD32 #-DENABLE_TRACE
+CFLAGS := -g -Wall -Werror -std=c99 $(OPT) -m64 #-DLIST_USE_HAZARD_POINTER -DENABLE_TRACE #-DTEST_STRING_KEYS #-DNBD32 
 INCS   := $(addprefix -I, include)
-TESTS  := output/map_test1 output/map_test2 output/txn_test
+TESTS  := output/map_test2 output/map_test1 output/txn_test 
 EXES   := $(TESTS)
 
-RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c datatype/nstring.c 
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c datatype/nstring.c runtime/hazard.c
 MAP_SRCS     := map/map.c map/list.c map/skiplist.c map/hashtable.c
 
+haz_test_SRCS  := $(RUNTIME_SRCS) test/haz_test.c
 rcu_test_SRCS  := $(RUNTIME_SRCS) test/rcu_test.c
 txn_test_SRCS  := $(RUNTIME_SRCS) $(MAP_SRCS) test/txn_test.c test/CuTest.c txn/txn.c
 map_test1_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/map_test1.c