From 21f1f96d711d4e745a87bc1561143887c02f1031 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Nov 2019 17:17:28 +0000
Subject: [PATCH] deps .*.d

---
 .gitignore           | 2 +-
 subdirmk/cdeps.mk.in | 4 ----
 subdirmk/cdeps.sd.mk | 5 +++++
 subdirmk/usual.mk.in | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 subdirmk/cdeps.mk.in
 create mode 100644 subdirmk/cdeps.sd.mk

diff --git a/.gitignore b/.gitignore
index e628bc9..bc1d33f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 ## Build artifacts.
 *.a
-*.d
+.*.d
 *.o
 *.stamp
 /lib/t/toytest
diff --git a/subdirmk/cdeps.mk.in b/subdirmk/cdeps.mk.in
deleted file mode 100644
index 7df96f3..0000000
--- a/subdirmk/cdeps.mk.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-&DEPFILES += $(patsubst %.o,%.d,$(&OBJECTS))
--include $(&DEPFILES)
-
diff --git a/subdirmk/cdeps.sd.mk b/subdirmk/cdeps.sd.mk
new file mode 100644
index 0000000..aeb35bf
--- /dev/null
+++ b/subdirmk/cdeps.sd.mk
@@ -0,0 +1,5 @@
+
+&DEPFILES += $(foreach b,$(patsubst %.o,%,$(&OBJECTS)), \
+		$(dir $b).$(notdir $b).d)
+-include $(&DEPFILES)
+
diff --git a/subdirmk/usual.mk.in b/subdirmk/usual.mk.in
index c961915..21cab7b 100644
--- a/subdirmk/usual.mk.in
+++ b/subdirmk/usual.mk.in
@@ -16,7 +16,7 @@ LIBS		?= @LIBS@
 
 LINK		?= $(CC) -o$@ $(CFLAGS) $(LDFLAGS)
 AR		?= ar
-COMPILE		?= $(CC) -c -o$@ -MD $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE		?= $(CC) -c -o$@ -MD -MF $(*D)/.$(*F).d $(DEFS) $(INCLUDES) $(CFLAGS)
 
 %.o: %.c
 	$(COMPILE) $<
-- 
2.30.2