# Makefile for building programs with whole-program interfile optimization
###################################################################################################
OPT := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 -m64 $(OPT) #-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/ll_test output/sl_test output/ht_test output/rcu_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
-MAP_SRCS := map/map.c map/nstring.c
-TEST_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS)
-rcu_test_SRCS := $(TEST_SRCS) test/rcu_test.c
-txn_test_SRCS := $(TEST_SRCS) txn/txn.c map/hashtable.c
-ll_test_SRCS := $(TEST_SRCS) test/ll_test.c map/list.c
-sl_test_SRCS := $(TEST_SRCS) test/sl_test.c map/skiplist.c
-ht_test_SRCS := $(TEST_SRCS) test/ht_test.c map/hashtable.c test/CuTest.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
+map_test2_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/map_test2.c test/CuTest.c
tests: $(TESTS)
gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
gcc $(CFLAGS) $(INCS) -o $@ $($*_SRCS)
+asm: $(addsuffix .s, $(EXES))
+
+$(addsuffix .s, $(EXES)): output/%.s : output/%.d makefile
+ gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > output/$*.d
+ gcc $(CFLAGS) $(INCS) -S -o $@.temp $($*_SRCS)
+ grep -v "^L[BFM]\|^LCF" $@.temp > $@
+ rm $@.temp
+
###################################################################################################
# tags file for vi
###################################################################################################
-include $(addsuffix .d, $(EXES))
-.PHONY: clean test tags
+.PHONY: clean test tags asm