code cleanup

[nbds] / makefile

diff --git a/makefile b/makefile
index 1e4072f9ffecced78de38fb4f5fd1367e044fa34..901a3639be381bcaf7081afa6e84571eb6e5032a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,7 +6,7 @@
 # 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 $(OPT) #-DENABLE_TRACE
 INCS   := $(addprefix -I, include)
 TESTS  := output/ll_test output/sl_test output/ht_test output/rcu_test
 EXES   := $(TESTS)
@@ -15,9 +15,9 @@ 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
+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)
 
@@ -33,11 +33,15 @@ $(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)
 
 ###################################################################################################
@@ -54,13 +58,10 @@ clean:
 
 .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) -MM -MT $@ $($*_SRCS) > $@
-
--include $(addsuffix .d, $(EXES))
+       touch $@