From: Brian Norris <banorris@uci.edu>
Date: Thu, 6 Dec 2012 22:10:28 +0000 (-0800)
Subject: Makefile: build dependencies in .*.o.d files
X-Git-Tag: oopsla2013~457
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;ds=sidebyside;h=65a79092518f7818c93238caa9ebfdab3f36cda8;p=model-checker.git

Makefile: build dependencies in .*.o.d files

My previous attempts at fixing dependency generation actually cause
full recompilation every time a file is changed. Apparently, it'll work
best if each target object has its own dependency file. i.e., target
'model.o' has a corresponding '.model.o.d' which holds its dependency
information.
---

diff --git a/.gitignore b/.gitignore
index 78006ce..d7ca89a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,9 @@
 *.so
 *~
 *.dot
+.*.d
 
 # files in this directory
 /tags
 /doc/docs
-/make.deps
 /benchmarks
diff --git a/Makefile b/Makefile
index 9b20f4c..1cc4f4b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,20 +17,8 @@ endif
 
 TESTS_DIR = test
 
-program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
-program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
-DEPS = make.deps
-
 all: $(LIB_SO) tests
 
-$(DEPS): build_deps := 1
-$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
-	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
-
-ifeq ($(build_deps),1)
-include $(DEPS)
-endif
-
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
@@ -44,12 +32,14 @@ $(LIB_SO): $(OBJECTS)
 malloc.o: malloc.c
 	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
-%.o: %.cc $(DEPS)
-	$(CXX) -fPIC -c $< $(CPPFLAGS)
+%.o: %.cc
+	$(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
+
+-include $(OBJECTS:%=.%.d)
 
 PHONY += clean
 clean:
-	rm -f *.o *.so
+	rm -f *.o *.so .*.d
 	$(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean