lock-free skiplist

[nbds] / makefile

diff --git a/makefile b/makefile
index 3b167e6a5c7fb6b102a876c4a3c5de58c2489d78..bc31f328342cfa93598c32bb70fdbbcde2ad844f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,22 +6,21 @@
 # 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) output/txn_test
+TESTS  := output/rcu_test output/list_test output/skiplist_test output/ht_test output/txn_test
+EXES   := $(TESTS)
 
 RUNTIME_SRCS   := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c 
-TEST_SRCS      := $(RUNTIME_SRCS) test/CuTest.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
+skiplist_test_SRCS := $(TEST_SRCS) struct/skiplist.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
 ###################################################################################################