From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 18 Oct 2024 08:30:44 +0000 (+0100)
Subject: Build: tidying
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/dd80338c6a23ab8a6af2875256f9077479f055b3?hp=e8727833517ce189507b9199b5a3f5c3e129040e

Build: tidying
---

diff --git a/src/Makefile b/src/Makefile
index 7b1434a59..86d6f083f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -89,17 +89,17 @@ install:        all
 
 # Tidy-up targets
 
-clean:; @echo ""; echo '*** "make clean" just removes all .o and .a files'
+clean_exim:; cd build-$(buildname); \
+	$(RM_COMMAND) -f *.o; \
+	for d in lookups auths routers transports miscmods; do \
+		$(RM_COMMAND) -f $$d/*.{o,a,so}; \
+	done; \
+	$(RM_COMMAND) -fr dynmodules
+
+clean:	clean_exim
+	@echo ""; echo '*** "make clean" just removes all .o and .a files'
 	@echo '*** Use "make makefile" to force a rebuild of the makefile'
 	@echo ""
-	cd build-$(buildname); \
-	$(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
-	routers/*.o routers/*.a transports/*.o transports/*.a \
-	pdkim/*.o pdkim/*.a
-
-clean_exim:; cd build-$(buildname); \
-	 $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
-	routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so
 
 distclean:; $(RM_COMMAND) -rf build-* cscope*
 
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index c27b5eb5c..dbd8f7ac9 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -1059,7 +1059,7 @@ buildmisc: config
 	     FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \
 	     PERL_CC="$(PERL_CC)" PERL_CCOPTS="$(PERL_CCOPTS)" \
 	     PERL_CFLAGS="$(PERL_CFLAGS)" PERL_LFLAGS="$(PERL_LFLAGS)" \
-	     INCLUDE="$(INCLUDE) $(IPV6_INCLUDE)"
+	     INCLUDE="$(INCLUDE) $(IPV6_INCLUDE)" TLS_INCLUDE="$(TLS_INCLUDE)"
 	 @echo " "
 
 # The "clean", "install", and "makefile" targets just pass themselves back to
diff --git a/src/src/miscmods/Makefile b/src/src/miscmods/Makefile
index 6aa082484..a59823084 100644
--- a/src/src/miscmods/Makefile
+++ b/src/src/miscmods/Makefile
@@ -57,7 +57,7 @@ dkim.o:
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) dkim.c
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) dkim_transport.c
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) pdkim.c
-	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) signing.c
+	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(TLS_INCLUDE) signing.c
 	$(FE)mv dkim.o dkim_tmp.o
 	$(FE)ld -r -o dkim.o $(LDFLAGS_PARTIAL) \
 		dkim_tmp.o dkim_transport.o pdkim.o signing.o
@@ -67,7 +67,7 @@ dkim.so:
 	@echo "$(CC) -shared dkim.c dkim_transport.c pdkim.c signing.c"
 	$(FE)$(CC) -DDYNLOOKUP $(CFLAGS_DYNAMIC) -o $@ \
 		$(SUPPORT_$*_INCLUDE) $(SUPPORT_$*_LIBS) \
-		$(CFLAGS) $(INCLUDE) $(DLFLAGS) \
+		$(CFLAGS) $(INCLUDE) $(TLS_INCLUDE) $(DLFLAGS) \
 		dkim.c dkim_transport.c pdkim.c signing.c
 
 # Compile instructions for static perl.o for when EXIM_PERL is set
diff --git a/src/src/miscmods/pdkim/signing.c b/src/src/miscmods/pdkim/signing.c
index 44f2e12ac..d8e77028c 100644
--- a/src/src/miscmods/pdkim/signing.c
+++ b/src/src/miscmods/pdkim/signing.c
@@ -29,7 +29,7 @@ features_crypto(void)
 #ifndef DISABLE_DKIM	/* rest of file */
 
 #ifdef DISABLE_TLS
-# error Must no DISABLE_TLS, for DKIM
+# error Must not DISABLE_TLS, for DKIM
 #endif