Makefile: Fix dependency generation to make .d files themselves dependent.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 91ab9c02cd623f583e03b5b241858f4b0fb40f43..7743ef52cf98f0b3babd0cd99d9c8c47f6de49bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,14 +19,21 @@ include lib/Makefile.local
 %.o: %.c
        $(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
 
-.depends: $(SRCS)
-       $(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
-       $(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
--include .depends
-
-CLEAN := $(CLEAN) .depends
+.deps/%.d: %.c
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CC) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) $< > $@.$$$$; \
+       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
+
+.deps/%.d: %.cc
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CXX) -M $(CPPFLAGS) $(NOTMUCH_CXX_DEPENDS_FLAGS) $< > $@.$$$$; \
+       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
+
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
 
 clean:
-       rm -f $(CLEAN)
-
-
+       rm -f $(CLEAN); rm -rf .deps