in txn, use a "naked" value without an update record whenever possible

[nbds] / makefile

diff --git a/makefile b/makefile
index 21fa6d9a53013ae17275d8e14f453ba1c084debb..82d921ebd2b15365a28b456437c50cd94c42e188 100644 (file)
--- a/makefile
+++ b/makefile
@@ -7,10 +7,10 @@
 OPT       := -fwhole-program -combine -03 #-DNDEBUG
 CFLAGS := -g -Wall -Werror -std=c99 -m64 $(OPT) #-DENABLE_TRACE
 INCS   := $(addprefix -I, include)
-TESTS  := output/map_test1 output/map_test2 output/rcu_test output/txn_test
+TESTS  := output/map_test1 output/map_test2 output/txn_test
 EXES   := $(TESTS)
 
-RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c runtime/nstring.c 
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c datatype/nstring.c 
 MAP_SRCS     := map/map.c map/list.c map/skiplist.c map/hashtable.c
 
 rcu_test_SRCS  := $(RUNTIME_SRCS) test/rcu_test.c