From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 01:35:37 +0000 (+0000)
Subject: build system: Use subdirmk cdeps.sd.mk
X-Git-Tag: v0.5.1~29
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=3f5770b8d127cced71abbf1e470488bc1a80a778

build system: Use subdirmk cdeps.sd.mk

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

diff --git a/.gitignore b/.gitignore
index 5a1032c..6efffd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.o
-*.d
+.*.d
 *.pyc
 conffile.tab.[ch]
 conffile.yy.[ch]
diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index 97b5483..029be4a 100644
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -65,6 +65,9 @@ OBJECTS:=version.o
 TEST_OBJECTS:=
 endif
 
+&OBJECTS += $(OBJECTS) $(TEST_OBJECTS)
+&:include subdirmk/cdeps.sd.mk
+
 STALE_PYTHON_FILES=	$(foreach e, py pyc, \
 			$(foreach p, /usr /usr/local, \
 			$(foreach l, ipaddr, \
@@ -80,7 +83,7 @@ STALE_PYTHON_FILES=	$(foreach e, py pyc, \
 	bison -d -o $@ $<
 
 %.o: %.c conffile.yy.h
-	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) $(CDEPS_CFLAGS) -c $< -o $@
 
 all::	$(TARGETS)
 
@@ -91,12 +94,6 @@ ${srcdir}/config.h.in: configure.ac
 MAKEFILE_TEMPLATES += config.h.in
 CONFIG_STATUS_OUTPUTS += config.h
 
-# C and header file dependency rules
-SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
-DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
-
--include *.d
-
 # Manual dependencies section
 conffile.yy.c:	conffile.fl conffile.tab.c
 conffile.yy.h:	conffile.yy.c
@@ -193,12 +190,13 @@ install-force:
 
 clean::
 	$(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
-	$(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
+	$(RM) -f *.pyc *~ eax-*-test.confirm eax-*-test
+	$(RM) $(&CLEAN)
 	$(RM) -rf __pycache__
 	$(RM) -f msgcode-test.confirm msgcode-test
 
 realclean::	clean
-	$(RM) -f *~ Makefile config.h  *.d \
+	$(RM) -f *~ Makefile config.h \
 	config.log config.status config.cache \
 	config.stamp Makefile.bak
 
diff --git a/common.make.in b/common.make.in
index d1f2fe0..b772704 100644
--- a/common.make.in
+++ b/common.make.in
@@ -31,5 +31,4 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
 	-Wmissing-declarations -Wnested-externs -Wredundant-decls \
 	-Wpointer-arith -Wformat=2 -Winit-self \
 	-Wswitch-enum -Wunused-variable -Wunused-function -Wbad-function-cast \
-	-Wno-strict-aliasing -fno-strict-aliasing \
-	-MMD
+	-Wno-strict-aliasing -fno-strict-aliasing
diff --git a/stest/Subdir.sd.mk b/stest/Subdir.sd.mk
index f35db3b..222e82c 100644
--- a/stest/Subdir.sd.mk
+++ b/stest/Subdir.sd.mk
@@ -34,3 +34,5 @@ MAKE_NOTSPECIAL:=$(MAKE)
 &check:: $(&DEPS)
 	env -u MAKEFLAGS -u MFLAGS \
 	$(MAKE_NOTSPECIAL) -j$(shell nproc || 1)0 &check-real
+
+&:include subdirmk/cdeps.sd.mk