X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=makefile;h=6baa518fff70eabcdc9d103a6cfef604e8e3ba85;hp=1e4072f9ffecced78de38fb4f5fd1367e044fa34;hb=df360b20f11476e53534a53c9ce11493d7c7a764;hpb=b21e1c182a2e469240d2b1cbbda37f2dfeb880d9

diff --git a/makefile b/makefile
index 1e4072f..6baa518 100644
--- a/makefile
+++ b/makefile
@@ -1,28 +1,27 @@
 ###################################################################################################
 # Written by Josh Dybnis and released to the public domain, as explained at
 # http://creativecommons.org/licenses/publicdomain
-#
 ###################################################################################################
 # 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
+OPT	   := -fwhole-program -combine -03 #-DNDEBUG
+CFLAGS := -g -Wall -Werror -std=c99 -m64 $(OPT) #-DENABLE_TRACE
 INCS   := $(addprefix -I, include)
-TESTS  := output/ll_test output/sl_test output/ht_test output/rcu_test
+TESTS  := output/map_test1 output/map_test2 output/rcu_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) test/rcu_test.c
-txn_test_SRCS := $(TEST_SRCS) struct/hashtable.c txn/txn.c
-ll_test_SRCS  := $(TEST_SRCS) struct/list.c test/ll_test.c
-sl_test_SRCS  := $(TEST_SRCS) struct/skiplist.c test/sl_test.c
-ht_test_SRCS  := $(TEST_SRCS) struct/hashtable.c test/ht_test.c test/CuTest.c
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c
+MAP_SRCS     := map/map.c map/nstring.c map/list.c map/skiplist.c map/hashtable.c
+
+rcu_test_SRCS  := $(RUNTIME_SRCS) test/rcu_test.c
+txn_test_SRCS  := $(RUNTIME_SRCS) $(MAP_SRCS) 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)
 
 ###################################################################################################
-# Run the tests
+# build and run tests
 ###################################################################################################
 test: $(addsuffix .log, $(TESTS))
 	@echo > /dev/null
@@ -33,15 +32,19 @@ $(addsuffix .log, $(TESTS)) : %.log : %
 ###################################################################################################
 # Rebuild an executable if any of it's source files need to be recompiled
 #
-# Note: Calculating dependancies as a side-effect of compilation is disabled. There is a bug in
+# Note: Calculating dependencies as a side-effect of compilation is disabled. There is a bug in
 # 		gcc. Compilation fails when -MM -MF is used and there is more than one source file.
-#		-MM -MT $@.d -MF $@.d
+#		Otherwise "-MM -MT $@.d -MF $@.d" should be part of the command line for the compile.
+#
+#       Also, when calculating dependencies -combine is removed from CFLAGS because of another bug 
+# 		in gcc. It chokes when -MM is used with -combine.
 ###################################################################################################
 $(EXES): output/% : output/%.d makefile
+	gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
 	gcc $(CFLAGS) $(INCS) -o $@ $($*_SRCS)
 
 ###################################################################################################
-# Build tags file for vi
+# tags file for vi
 ###################################################################################################
 tags:
 	ctags -R .
@@ -52,15 +55,11 @@ tags:
 clean:
 	rm -rfv output/*
 
-.PHONY: clean test tags
-
 ###################################################################################################
-# Generate the dependencies lists for each executable
-#
-# Note: -combine is removed from CFLAGS because of a bug in gcc. The compiler chokes when
-# 		-MM is used with -combine.
+# dummy rule for boostrapping dependency files
 ###################################################################################################
 $(addsuffix .d, $(EXES)) : output/%.d :
-	gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > $@
 
 -include $(addsuffix .d, $(EXES))
+
+.PHONY: clean test tags