X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=makefile;h=901a3639be381bcaf7081afa6e84571eb6e5032a;hp=3b167e6a5c7fb6b102a876c4a3c5de58c2489d78;hb=9b3e566281f7e2ac0683205042796958bfd8939f;hpb=010e49988a8b12f78053c387b3798763b4e8df18

diff --git a/makefile b/makefile
index 3b167e6..901a363 100644
--- a/makefile
+++ b/makefile
@@ -3,24 +3,23 @@
 # http://creativecommons.org/licenses/publicdomain
 #
 ###################################################################################################
-# Makefile for building programs with whole-program interfile optimization 
+# 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/rcu_test output/list_test output/ht_test
-EXES   := $(TESTS) output/txn_test
+TESTS  := output/ll_test output/sl_test output/ht_test output/rcu_test
+EXES   := $(TESTS)
 
-RUNTIME_SRCS   := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c 
-TEST_SRCS      := $(RUNTIME_SRCS) test/CuTest.c
-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
-txn_test_SRCS  := $(TEST_SRCS) struct/ht.c txn/txn.c
+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 struct/nstring.c
+sl_test_SRCS  := $(TEST_SRCS) struct/skiplist.c test/sl_test.c struct/nstring.c
+ht_test_SRCS  := $(TEST_SRCS) struct/hashtable.c test/ht_test.c test/CuTest.c struct/nstring.c
 
-tests: $(TESTS) 
-
-txn: output/txn_test
+tests: $(TESTS)
 
 ###################################################################################################
 # Run the tests
@@ -28,18 +27,22 @@ txn: output/txn_test
 test: $(addsuffix .log, $(TESTS))
 	@echo > /dev/null
 
-$(addsuffix .log, $(TESTS)) : %.log : % 
+$(addsuffix .log, $(TESTS)) : %.log : %
 	@echo "Running $*" && $* | tee $*.log
 
 ###################################################################################################
-# Rebuild an executable if any of it's source files need to be recompiled 
+# 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) $(INCS) -DMAKE_$* -o $@ $($*_SRCS)
+	gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
+	gcc $(CFLAGS) $(INCS) -o $@ $($*_SRCS)
 
 ###################################################################################################
 # Build tags file for vi
@@ -48,20 +51,17 @@ tags:
 	ctags -R .
 
 ###################################################################################################
-# 
+#
 ###################################################################################################
 clean:
 	rm -rfv output/*
 
 .PHONY: clean test tags
 
+-include $(addsuffix .d, $(EXES))
+
 ###################################################################################################
-# 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) -DMAKE_$* -MM -MT $@ $($*_SRCS) > $@
-
--include $(addsuffix .d, $(EXES))
+	touch $@