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

diff --git a/makefile b/makefile
index 939f8dd..a4700ef 100644
--- 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) 
 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
+skiplist_test_SRCS := $(TEST_SRCS) struct/skiplist.c
+ht_test_SRCS := $(TEST_SRCS) struct/hashtable.c test/ht_test.c test/CuTest.c
+txn_test_SRCS  := $(TEST_SRCS) struct/hashtable.c txn/txn.c
 
 tests: $(TESTS) 
 
-txn: output/txn_test
-
 ###################################################################################################
 # Run the tests
 ###################################################################################################