Introduce CDEPS_CFLAGS so without cdeps.sd.mk you don't get .*.d

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/subdirmk/cdeps.sd.mk b/subdirmk/cdeps.sd.mk
index c898cc09d1c6e3337364b824a6b5af2f1260245d..6ba0bbb271093c94130ed56d649181f34bbd378f 100644 (file)
--- a/subdirmk/cdeps.sd.mk
+++ b/subdirmk/cdeps.sd.mk
@@ -3,6 +3,8 @@
 #  Copyright 2019 Ian Jackson
 # SPDX-License-Identifier: LGPL-2.0-or-later
 
 #  Copyright 2019 Ian Jackson
 # SPDX-License-Identifier: LGPL-2.0-or-later
 

+CDEPS_CFLAGS ?= -MD -MF $(*D)/.$(*F).d
+

 &DEPFILES += $(foreach b,$(patsubst %.o,%,$(&OBJECTS)), \
                $(dir $b).$(notdir $b).d)
 -include $(&DEPFILES)
 &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 97f99e71bd676abb016dc1c3f78b015729f5240d..c40a18f22b58eb44ec03404372ff3bafe430f50c 100644 (file)
--- a/subdirmk/usual.mk.in
+++ b/subdirmk/usual.mk.in
@@ -19,7 +19,7 @@ LIBS          ?= @LIBS@
 
 LINK           ?= $(CC) -o$@ $(CFLAGS) $(LDFLAGS)
 AR             ?= ar
 
 LINK           ?= $(CC) -o$@ $(CFLAGS) $(LDFLAGS)
 AR             ?= ar

-COMPILE                ?= $(CC) -c -o$@ -MD -MF $(*D)/.$(*F).d $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE                ?= $(CC) -c -o$@ $(CDEPS_CFLAGS) $(DEFS) $(INCLUDES) $(CFLAGS)

 
 %.o: %.c
        $(COMPILE) $<
 
 %.o: %.c
        $(COMPILE) $<