X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f1be21cf0b8b97a64dfe17f2ca05bb4b9efe8d32..142fd50739f5ba92bac4a0162d03d818e78dd3b7:/src/OS/Makefile-Base?ds=sidebyside

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index b99cb9ffc..d8df29672 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -5,7 +5,8 @@
 # optional, Local/* files at the front of this file, to create Makefile in the
 # build directory.
 #
-# Copyright (c) The Exim Maintainers 1995 - 2018
+# Copyright (c) The Exim Maintainers 1995 - 2024
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 SHELL      = $(MAKE_SHELL)
 SCRIPTS    = ../scripts
@@ -35,9 +36,12 @@ FE       = $(FULLECHO)
 # up-to-date. Then the os-specific source files and the C configuration file
 # are set up, and finally it goes to the main Exim target.
 
-all:       utils exim
+all:       utils exim dynmodules
 config:    $(EDITME) checklocalmake Makefile os.c config.h version.h version.sh macro.c
 
+exim_openssl exim_gnutls: clean exim
+	cp exim $@
+
 checklocalmake:
 	@if $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(OSTYPE) $(EDITME) || \
 	  $(SHELL) $(SCRIPTS)/newer $(EDITME)-$(ARCHTYPE) $(EDITME) || \
@@ -79,24 +83,9 @@ Makefile: ../OS/Makefile-Base ../OS/Makefile-Default \
 
 # Build (link) the os.h file
 
-#os.h:	$(SCRIPTS)/Configure-os.h \
-#	$(O)/os.h-AIX		$(O)/os.h-BSDI	$(O)/os.h-cygwin \
-#	$(O)/os.h-Darwin	$(O)/os.h-DGUX	$(O)/os.h-DragonFly \
-#	$(O)/os.h-FreeBSD	$(O)/os.h-GNU	$(O)/os.h-GNUkFreeBSD \
-#	$(O)/os.h-GNUkNetBSD	$(O)/os.h-HI-OSF \
-#	$(O)/os.h-HI-UX		$(O)/os.h-HP-UX	$(O)/os.h-HP-UX-9 \
-#	$(O)/os.h-IRIX		$(O)/os.h-IRIX6	$(O)/os.h-IRIX632 \
-#	$(O)/os.h-IRIX65	$(O)/os.h-Linux	$(O)/os.h-mips \
-#	$(O)/os.h-NetBSD	$(O)/os.h-NetBSD-a.out \
-#	$(O)/os.h-OpenBSD	$(O)/os.h-OpenUNIX	$(O)/os.h-OSF1 \
-#	$(O)/os.h-QNX		$(O)/os.h-SCO		$(O)/os.h-SCO_SV \
-#	$(O)/os.h-SunOS4	$(O)/os.h-SunOS5	$(O)/os.h-SunOS5-hal \
-#	$(O)/os.h-ULTRIX	$(O)/os.h-UNIX_SV \
-#	$(O)/os.h-Unixware7	$(O)/os.h-USG
-#	$(SHELL) $(SCRIPTS)/Configure-os.h
-
 os.h:	$(SCRIPTS)/Configure-os.h \
 	$(O)/os.h-FreeBSD	\
+	$(O)/os.h-GNU		\
 	$(O)/os.h-Linux		\
 	$(O)/os.h-OpenBSD	\
 	$(O)/os.h-SunOS5
@@ -104,16 +93,12 @@ os.h:	$(SCRIPTS)/Configure-os.h \
 
 # Build the os.c file
 
-#os.c:   ../src/os.c \
-#	$(SCRIPTS)/Configure-os.c \
-#	$(O)/os.c-cygwin	$(O)/os.c-GNU	$(O)/os.c-HI-OSF \
-#	$(O)/os.c-IRIX		$(O)/os.c-IRIX6	$(O)/os.c-IRIX632 \
-#	$(O)/os.c-IRIX65	$(O)/os.c-Linux	$(O)/os.c-OSF1
-#	$(SHELL) $(SCRIPTS)/Configure-os.c
-
 os.c:   ../src/os.c \
 	$(SCRIPTS)/Configure-os.c \
-	$(O)/os.c-Linux
+	$(O)/os.c-FreeBSD	\
+	$(O)/os.c-GNU		\
+	$(O)/os.c-Linux		\
+	$(O)/os.c-SunOS5
 	$(SHELL) $(SCRIPTS)/Configure-os.c
 
 # Build the config.h file.
@@ -123,18 +108,18 @@ config.h: Makefile buildconfig ../src/config.h.defaults $(EDITME)
 
 # Build the builtin-macros data struct
 
-MACRO_HSRC = macro_predef.h os.h globals.h config.h \
+MACRO_HSRC = macro_predef.h os.h globals.h config.h macros.h path_max.h \
 	routers/accept.h routers/dnslookup.h routers/ipliteral.h \
 	routers/iplookup.h routers/manualroute.h routers/queryprogram.h \
 	routers/redirect.h
 
 OBJ_MACRO = macro_predef.o \
-	macro-globals.o macro-readconf.o macro-route.o macro-transport.o macro-drtables.o \
-	macro-tls.o \
+	macro-globals.o macro-readconf.o macro-expand.o macro-route.o \
+	macro-transport.o macro-drtables.o macro-acl.o macro-tls.o \
 	macro-appendfile.o macro-autoreply.o macro-lmtp.o macro-pipe.o macro-queuefile.o \
 	macro-smtp.o macro-accept.o macro-dnslookup.o macro-ipliteral.o macro-iplookup.o \
 	macro-manualroute.o macro-queryprogram.o macro-redirect.o \
-	macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl_exim.o \
+	macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl.o \
 	macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-authtls.o macro-external.o \
 	macro-dkim.o macro-malware.o macro-signing.o
 
@@ -149,6 +134,9 @@ macro-globals.o :	globals.c
 macro-readconf.o :	readconf.c
 	@echo "$(CC) -DMACRO_PREDEF readconf.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ readconf.c
+macro-expand.o :	expand.c
+	@echo "$(CC) -DMACRO_PREDEF expand.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ expand.c
 macro-route.o :		route.c
 	@echo "$(CC) -DMACRO_PREDEF route.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ route.c
@@ -158,7 +146,10 @@ macro-transport.o:	transport.c
 macro-drtables.o :	drtables.c
 	@echo "$(CC) -DMACRO_PREDEF drtables.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ drtables.c
-macro-tls.o:	tls.c
+macro-acl.o:	acl.c
+	@echo "$(CC) -DMACRO_PREDEF acl.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ acl.c
+macro-tls.o:	tls.c tls-gnu.c tls-openssl.c
 	@echo "$(CC) -DMACRO_PREDEF tls.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ tls.c
 macro-appendfile.o :	transports/appendfile.c
@@ -215,9 +206,9 @@ macro-dovecot.o:	auths/dovecot.c
 macro-external.o:	auths/external.c
 	@echo "$(CC) -DMACRO_PREDEF auths/external.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/external.c
-macro-gsasl_exim.o :	auths/gsasl_exim.c
-	@echo "$(CC) -DMACRO_PREDEF auths/gsasl_exim.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/gsasl_exim.c
+macro-gsasl.o :	auths/gsasl.c
+	@echo "$(CC) -DMACRO_PREDEF auths/gsasl.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/gsasl.c
 macro-heimdal_gssapi.o:	auths/heimdal_gssapi.c
 	@echo "$(CC) -DMACRO_PREDEF auths/heimdal_gssapi.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/heimdal_gssapi.c
@@ -230,15 +221,15 @@ macro-spa.o :		auths/spa.c
 macro-authtls.o:	auths/tls.c
 	@echo "$(CC) -DMACRO_PREDEF auths/tls.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/tls.c
-macro-dkim.o:		dkim.c
-	@echo "$(CC) -DMACRO_PREDEF dkim.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ dkim.c
+macro-dkim.o:		miscmods/dkim.c
+	@echo "$(CC) -DMACRO_PREDEF miscmods/dkim.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ miscmods/dkim.c
 macro-malware.o:	malware.c
 	@echo "$(CC) -DMACRO_PREDEF malware.c"
 	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ malware.c
-macro-signing.o:	pdkim/signing.c
-	@echo "$(CC) -DMACRO_PREDEF pdkim/signing.c"
-	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ pdkim/signing.c
+macro-signing.o:	miscmods/signing.c
+	@echo "$(CC) -DMACRO_PREDEF miscmods/signing.c"
+	$(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ miscmods/signing.c
 
 macro_predef: $(OBJ_MACRO)
 	@echo "$(LNCC) -o $@"
@@ -253,15 +244,15 @@ macro.c: macro_predef
 # problem, but it does no harm. Other make programs will just ignore this.
 
 .PHONY: all config utils \
-	buildauths buildlookups buildpdkim buildrouters \
-        buildtransports checklocalmake clean
+	buildauths buildlookups buildrouters \
+        buildtransports buildmisc dynmodules checklocalmake clean
 
 
 utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \
         exigrep eximstats exipick exiqgrep exiqsumm \
-        transport-filter.pl convert4r3 convert4r4 \
-        exim_checkaccess \
-        exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock
+        transport-filter.pl exim_checkaccess \
+        exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb \
+	exim_lock exim_msgdate exim_id_update
 
 
 # Targets for special-purpose configuration header builders
@@ -295,6 +286,7 @@ exicyclog: config ../src/exicyclog.src
 	  ../src/exicyclog.src > exicyclog-t
 	@mv exicyclog-t exicyclog
 	@chmod a+x exicyclog
+	@./exicyclog -v 2>&1 >/dev/null
 	@echo ">>> exicyclog script built"
 
 # Target for the exinext utility script
@@ -312,6 +304,7 @@ exinext: config ../src/exinext.src
 	  ../src/exinext.src > exinext-t
 	@mv exinext-t exinext
 	@chmod a+x exinext
+	@./exinext -v 2>&1 >/dev/null
 	@echo ">>> exinext script built"
 
 # Target for the exiwhat utility script
@@ -336,6 +329,7 @@ exiwhat: config ../src/exiwhat.src
 	  ../src/exiwhat.src > exiwhat-t
 	@mv exiwhat-t exiwhat
 	@chmod a+x exiwhat
+	@./exiwhat -v 2>&1 >/dev/null
 	@echo ">>> exiwhat script built"
 
 # Target for the exim_checkaccess utility script
@@ -354,6 +348,7 @@ exim_checkaccess: config ../src/exim_checkaccess.src
 	  ../src/exim_checkaccess.src > exim_checkaccess-t
 	@mv exim_checkaccess-t exim_checkaccess
 	@chmod a+x exim_checkaccess
+	# @./exim_checkaccess -v 2>&1 >/dev/null
 	@echo ">>> exim_checkaccess script built"; echo ""
 
 # Target for the Exim monitor start-up script
@@ -374,6 +369,7 @@ eximon: config ../src/eximon.src ../OS/eximon.conf-Default \
 	  -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
 	  -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
 	  ../src/eximon.src >> eximon
+	@./eximon -v 2>&1 >/dev/null
 	@echo ">>> eximon script built"; echo ""
 
 # Targets for utilities; these are all Perl scripts that have to get the
@@ -393,8 +389,27 @@ exigrep: config ../src/exigrep.src
 	  ../src/exigrep.src > exigrep-t
 	@mv exigrep-t exigrep
 	@chmod a+x exigrep
+	@./exigrep --version 2>&1 >/dev/null
 	@echo ">>> exigrep script built"
 
+exim_msgdate: config ../src/exim_msgdate.src
+	@rm -f exim_msgdate
+	@. ./version.sh && sed \
+	  -e "s?PROCESSED_FLAG?This file has been so processed.?"\
+	  -e "/^[ \t]*# /p" \
+	  -e "/^[ \t]*# /d" \
+	  -e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
+	  -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+	  -e "s?BASE_62?$${BASE_62:-62}?" \
+	  -e "s?CONFIGURE_FILE\"?$(CONFIGURE_FILE)\"?" \
+	  -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+	  -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
+	  ../src/exim_msgdate.src > exim_msgdate-t
+	@mv exim_msgdate-t exim_msgdate
+	@chmod a+x exim_msgdate
+	@./exim_msgdate -v 2>&1 >/dev/null
+	@echo ">>> exim_msgdate script built"
+
 eximstats: config ../src/eximstats.src
 	@rm -f eximstats
 	@. ./version.sh && sed \
@@ -404,6 +419,7 @@ eximstats: config ../src/eximstats.src
 	  ../src/eximstats.src > eximstats-t
 	@mv eximstats-t eximstats
 	@chmod a+x eximstats
+	@./eximstats -v 2>&1 >/dev/null
 	@echo ">>> eximstats script built"
 
 exiqgrep: config ../src/exiqgrep.src
@@ -419,6 +435,7 @@ exiqgrep: config ../src/exiqgrep.src
 	  ../src/exiqgrep.src > exiqgrep-t
 	@mv exiqgrep-t exiqgrep
 	@chmod a+x exiqgrep
+	@./exiqgrep -v 2>&1 >/dev/null
 	@echo ">>> exiqgrep script built"
 
 exiqsumm: config ../src/exiqsumm.src
@@ -430,6 +447,7 @@ exiqsumm: config ../src/exiqsumm.src
 	  ../src/exiqsumm.src > exiqsumm-t
 	@mv exiqsumm-t exiqsumm
 	@chmod a+x exiqsumm
+	@./exiqsumm -v 2>&1 >/dev/null
 	@echo ">>> exiqsumm script built"
 
 exipick: config ../src/exipick.src
@@ -443,8 +461,23 @@ exipick: config ../src/exipick.src
 	  ../src/exipick.src > exipick-t
 	@mv exipick-t exipick
 	@chmod a+x exipick
+	@./exipick -v 2>&1 >/dev/null
 	@echo ">>> exipick script built"
 
+exim_id_update: config ../src/exim_id_update.src
+	@rm -f exim_id_update
+	@. ./version.sh && sed \
+	  -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
+	  -e "s?SPOOL_DIRECTORY?$(SPOOL_DIRECTORY)?" \
+	  -e "s?BIN_DIRECTORY?$(BIN_DIRECTORY)?" \
+	  -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
+	  -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
+	  ../src/exim_id_update.src > exim_id_update-t
+	@mv exim_id_update-t exim_id_update
+	@chmod a+x exim_id_update
+	@./exim_id_update -v 2>&1 >/dev/null
+	@echo ">>> exim_id_update script built"
+
 transport-filter.pl: config ../src/transport-filter.src
 	@rm -f transport-filter.pl
 	@. ./version.sh && sed \
@@ -456,69 +489,49 @@ transport-filter.pl: config ../src/transport-filter.src
 	@chmod a+x transport-filter.pl
 	@echo ">>> transport-filter.pl script built"
 
-convert4r3: config ../src/convert4r3.src
-	@rm -f convert4r3
-	@. ./version.sh && sed \
-	  -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-	  -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
-	  -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
-	  ../src/convert4r3.src > convert4r3-t
-	@mv convert4r3-t convert4r3
-	@chmod a+x convert4r3
-	@echo ">>> convert4r3 script built"
-
-convert4r4: config ../src/convert4r4.src
-	@rm -f convert4r4
-	@. ./version.sh && sed \
-	  -e "s?PERL_COMMAND?$(PERL_COMMAND)?" \
-	  -e "s?EXIM_RELEASE_VERSION?$${EXIM_RELEASE_VERSION}?" \
-	  -e "s?EXIM_VARIANT_VERSION?$${EXIM_VARIANT_VERSION}?" \
-	  ../src/convert4r4.src > convert4r4-t
-	@mv convert4r4-t convert4r4
-	@chmod a+x convert4r4
-	@echo ">>> convert4r4 script built"
-
 
 # These are objects of optional features. They are always compiled, but
 # if the corresponding #defines are not set, they wind up empty and
 # are thrown away by the linker.
 
 OBJ_WITH_CONTENT_SCAN = malware.o mime.o regex.o spam.o spool_mbox.o
-OBJ_EXPERIMENTAL =	arc.o \
-			bmi_spam.o \
+OBJ_EXPERIMENTAL =	bmi_spam.o \
 			dane.o \
 			dcc.o \
-			dmarc.o \
 			imap_utf7.o \
-			spf.o \
-			srs.o \
-			utf8.o
+			utf8.o \
+			xclient.o
 
 # Targets for final binaries; the main one has a build number which is
 # updated each time. We don't bother with that for the auxiliaries.
 
-OBJ_LOOKUPS = lookups/lf_quote.o lookups/lf_check_file.o lookups/lf_sqlperform.o
+OBJ_LOOKUPS = lf_quote.o lf_check_file.o lf_sqlperform.o
+OBJ_ROUTERS = rf_change_domain.o rf_expand_data.o rf_get_errors_address.o \
+	rf_get_munge_headers.o rf_get_transport.o rf_get_ugid.o \
+	rf_lookup_hostlist.o rf_queue_add.o rf_self_action.o rf_set_ugid.o
+OBJ_AUTHS = call_pwcheck.o check_serv_cond.o \
+	get_data.o get_no64_data.o pwcheck.o
 
 OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         directory.o dns.o drtables.o enq.o exim.o expand.o filter.o \
-        filtertest.o globals.o dkim.o dkim_transport.o hash.o \
-        header.o host.o ip.o log.o lss.o match.o moan.o \
-        os.o parse.o queue.o \
-        rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \
+        filtertest.o globals.o dnsbl.o hash.o \
+        header.o host.o host_address.o ip.o log.o lss.o match.o md5.o moan.o \
+        os.o parse.o priv.o proxy.o queue.o \
+        rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o regex_cache.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \
-        environment.o macro.o \
-        $(OBJ_LOOKUPS) \
-        local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
+        xtextencode.o environment.o macro.o \
+        $(OBJ_LOOKUPS) $(OBJ_ROUTERS) $(OBJ_AUTHS) \
+        local_scan.o $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_EXPERIMENTAL)
 
-exim:   buildlookups buildauths pdkim/pdkim.a \
-        buildrouters buildtransports \
+exim:   buildlookups buildauths \
+        buildrouters buildtransports buildmisc \
         $(OBJ_EXIM) version.o
 	@echo "$(LNCC) -o exim"
 	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
 	  routers/routers.a transports/transports.a lookups/lookups.a \
-	  auths/auths.a pdkim/pdkim.a \
+	  auths/auths.a miscmods/miscmods.a \
 	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
 	  $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \
 	  $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS)
@@ -533,7 +546,7 @@ exim:   buildlookups buildauths pdkim/pdkim.a \
 
 # The utility for dumping the contents of an exim database
 
-OBJ_DUMPDB = exim_dumpdb.o util-os.o util-store.o
+OBJ_DUMPDB = exim_dumpdb.o util-os.o util-store.o util-xtextencode.o
 
 exim_dumpdb: $(OBJ_DUMPDB)
 	@echo "$(LNCC) -o exim_dumpdb"
@@ -548,12 +561,12 @@ exim_dumpdb: $(OBJ_DUMPDB)
 
 # The utility for interrogating/fixing the contents of an exim database
 
-OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o
+OBJ_FIXDB = exim_fixdb.o util-os.o util-store.o util-md5.o util-xtextencode.o
 
-exim_fixdb:  $(OBJ_FIXDB) buildauths
+exim_fixdb:  $(OBJ_FIXDB)
 	@echo "$(LNCC) -o exim_fixdb"
 	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
-	  auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB)
+	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
 	  echo $(STRIP_COMMAND) exim_fixdb; \
 	  $(STRIP_COMMAND) exim_fixdb; \
@@ -563,11 +576,12 @@ exim_fixdb:  $(OBJ_FIXDB) buildauths
 
 # The utility for tidying the contents of an exim database
 
-OBJ_TIDYDB = exim_tidydb.o util-os.o util-store.o
+OBJ_TIDYDB = exim_tidydb.o util-os.o util-store.o util-xtextencode.o
 
 exim_tidydb: $(OBJ_TIDYDB)
 	@echo "$(LNCC) -o exim_tidydb"
-	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
+	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) \
+	  $(OBJ_TIDYDB) \
 	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
 	  echo $(STRIP_COMMAND) exim_tidydb; \
@@ -578,9 +592,12 @@ exim_tidydb: $(OBJ_TIDYDB)
 
 # The utility for building dbm files
 
-exim_dbmbuild: exim_dbmbuild.o
+OBJ_DBMBUILD = exim_dbmbuild.o util-xtextencode.o
+
+exim_dbmbuild: $(OBJ_DBMBUILD)
 	@echo "$(LNCC) -o exim_dbmbuild"
-	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \
+	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) \
+	  $(OBJ_DBMBUILD) \
 	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
 	  echo $(STRIP_COMMAND) exim_dbmbuild; \
@@ -618,16 +635,18 @@ MONBIN = em_StripChart.o $(EXIMON_TEXTPOP) em_globals.o em_init.o \
 # The complete modules list also includes some specially compiled versions of
 # code from the main Exim source tree.
 
-OBJ_MONBIN = util-spool_in.o \
+OBJ_MONBIN = util-host_address.o \
+	     util-queue.o \
+	     util-spool_in.o \
 	     util-store.o \
 	     util-string.o \
-	     util-queue.o \
 	     util-tod.o \
-	     tree.o \
+	     util-tree.o \
+	     util-xtextencode.o \
 	     $(MONBIN)
 
-eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
-            ../exim_monitor/em_version.c
+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) ../exim_monitor/em_version.c \
+		mytypes.h store.h path_max.h macros.h
 	@echo "$(CC) exim_monitor/em_version.c"
 	$(FE)$(CC) -o em_version.o -c \
 	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
@@ -652,26 +671,48 @@ eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
 HDRS  =	blob.h \
 	config.h \
 	dbfunctions.h \
-	dbstuff.h \
 	exim.h \
 	functions.h \
 	globals.h \
 	hash.h \
+	hintsdb.h \
+	hintsdb_structs.h \
+	hintsdb/hints_bdb.h \
+	hintsdb/hints_gdbm.h \
+	hintsdb/hints_ndbm.h \
+	hintsdb/hints_sqlite.h \
+	hintsdb/hints_tdb.h \
 	local_scan.h \
 	macros.h \
+	miscmods/arc_api.h \
+	miscmods/dkim_api.h \
+	miscmods/dmarc_api.h \
+	miscmods/spf_api.h \
 	mytypes.h \
+	path_max.h \
 	sha_ver.h \
 	structs.h \
 	os.h
 PHDRS = ../config.h \
 	../dbfunctions.h \
-	../dbstuff.h \
 	../exim.h \
 	../functions.h \
 	../globals.h \
+	../hintsdb.h \
+	../hintsdb_structs.h \
+	../hintsdb/hints_bdb.h \
+	../hintsdb/hints_gdbm.h \
+	../hintsdb/hints_ndbm.h \
+	../hintsdb/hints_sqlite.h \
+	../hintsdb/hints_tdb.h \
 	../local_scan.h \
 	../macros.h \
+	../miscmods/arc_api.h \
+	../miscmods/dkim_api.h \
+	../miscmods/dmarc_api.h \
+	../miscmods/spf_api.h \
 	../mytypes.h \
+	../path_max.h \
 	../structs.h \
 	../os.h
 
@@ -679,11 +720,14 @@ PHDRS = ../config.h \
 .c.o:;  @echo "$(CC) $*.c"
 	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $*.c
 
-# Update Exim's version information and build the version object.
+# Update Exim's version information and build the version object.  The dependency
+# chain here avoids problems under parallel-make.
 
-version.h version.sh::
+version.sh:
 	@../scripts/reversion
 
+version.h: version.sh
+
 cnumber.h: version.h
 
 version.o: $(HDRS) cnumber.h version.h version.c
@@ -694,12 +738,6 @@ version.o: $(HDRS) cnumber.h version.h version.c
 
 dummies.o:       dummies.c
 
-# Compile instructions for perl.o for when EXIM_PERL is set
-
-perl.o:          $(HDRS) perl.c
-	@echo "$(PERL_CC) perl.c"
-	$(FE)$(PERL_CC) $(PERL_CCOPTS) $(CFLAGS) $(INCLUDE) -c perl.c
-
 # Compile instructions for the database utility modules
 
 exim_dumpdb.o:   $(HDRS) exim_dbutil.c
@@ -733,6 +771,14 @@ exim_dbmbuild.o: $(HDRS) exim_dbmbuild.c
 # Utilities use special versions of some modules - typically with debugging
 # calls cut out.
 
+util-host_address.o:   $(HDRS) host_address.c
+	@echo "$(CC) -DCOMPILE_UTILITY host_address.c"
+	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-host_address.o host_address.c
+
+util-md5.o:   $(HDRS) md5.c
+	@echo "$(CC) -DCOMPILE_UTILITY queue.c"
+	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-md5.o md5.c
+
 util-spool_in.o: $(HDRS) spool_in.c
 	@echo "$(CC) -DCOMPILE_UTILITY spool_in.c"
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-spool_in.o spool_in.c
@@ -753,6 +799,14 @@ util-tod.o:   $(HDRS) tod.c
 	@echo "$(CC) -DCOMPILE_UTILITY tod.c"
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-tod.o tod.c
 
+util-tree.o:   $(HDRS) tree.c
+	@echo "$(CC) -DCOMPILE_UTILITY tree.c"
+	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-tree.o tree.c
+
+util-xtextencode.o:   $(HDRS) xtextencode.c
+	@echo "$(CC) -DCOMPILE_UTILITY xtextencode.c"
+	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-xtextencode.o xtextencode.c
+
 util-os.o:       $(HDRS) os.c
 	@echo "$(CC) -DCOMPILE_UTILITY os.c"
 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) \
@@ -766,7 +820,7 @@ util-os.o:       $(HDRS) os.c
 
 local_scan.o:    config local_scan.h ../$(LOCAL_SCAN_SOURCE)
 	@echo "$(CC) local_scan.c"
-	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) -o local_scan.o ../$(LOCAL_SCAN_SOURCE)
+	$(FE)$(CC) -DLOCAL_SCAN -c $(CFLAGS) -I. $(INCLUDE) -o local_scan.o ../$(LOCAL_SCAN_SOURCE)
 
 # Dependencies for the "ordinary" exim modules
 
@@ -780,6 +834,7 @@ debug.o:         $(HDRS) debug.c
 deliver.o:       $(HDRS) transports/smtp.h deliver.c
 directory.o:     $(HDRS) directory.c
 dns.o:           $(HDRS) dns.c
+dnsbl.o:         $(HDRS) dnsbl.c
 enq.o:           $(HDRS) enq.c
 exim.o:          $(HDRS) exim.c
 expand.o:        $(HDRS) expand.c
@@ -790,19 +845,24 @@ globals.o:       $(HDRS) globals.c
 hash.o:          $(HDRS) hash.c
 header.o:        $(HDRS) header.c
 host.o:          $(HDRS) host.c
+host_address.o:  $(HDRS) host_address.c
 ip.o:            $(HDRS) ip.c
 log.o:           $(HDRS) log.c
 lss.o:           $(HDRS) lss.c
 match.o:         $(HDRS) match.c
+md5.o:           $(HDRS) md5.c
 moan.o:          $(HDRS) moan.c
 os.o:            $(HDRS) $(OS_C_INCLUDES) os.c
 parse.o:         $(HDRS) parse.c
+priv.o:          $(HDRS) priv.c
+proxy.o:         $(HDRS) proxy.c
 queue.o:         $(HDRS) queue.c
 rda.o:           $(HDRS) rda.c
 readconf.o:      $(HDRS) readconf.c
 receive.o:       $(HDRS) receive.c
 retry.o:         $(HDRS) retry.c
 rewrite.o:       $(HDRS) rewrite.c
+regex_cache.o:   $(HDRS) regex_cache.c
 rfc2047.o:       $(HDRS) rfc2047.c
 route.o:         $(HDRS) route.c
 search.o:        $(HDRS) search.c
@@ -822,8 +882,7 @@ tod.o:           $(HDRS) tod.c
 transport.o:     $(HDRS) transport.c
 tree.o:          $(HDRS) tree.c
 verify.o:        $(HDRS) transports/smtp.h verify.c
-dkim.o:          $(HDRS) pdkim/pdkim.h dkim.c
-dkim_transport.o: $(HDRS) dkim_transport.c
+xtextencode.o:   $(HDRS) xtextencode.c
 
 # Dependencies for WITH_CONTENT_SCAN modules
 
@@ -836,15 +895,12 @@ spool_mbox.o:    $(HDRS) spool_mbox.c
 
 # Dependencies for EXPERIMENTAL_* modules
 
-arc.o:		$(HDRS) pdkim/pdkim.h arc.c
 bmi_spam.o:	$(HDRS) bmi_spam.c
 dane.o:		$(HDRS) dane.c dane-openssl.c
 dcc.o:		$(HDRS) dcc.h dcc.c
-dmarc.o:	$(HDRS) pdkim/pdkim.h dmarc.h dmarc.c
 imap_utf7.o:	$(HDRS) imap_utf7.c
-spf.o:		$(HDRS) spf.h spf.c
-srs.o:		$(HDRS) srs.h srs.c
 utf8.o:		$(HDRS) utf8.c
+xclient.o:	$(HDRS) xclient.c
 
 # The module containing tables of available lookups, routers, auths, and
 # transports must be rebuilt if any of them are. However, because the makefiles
@@ -856,11 +912,73 @@ utf8.o:		$(HDRS) utf8.c
 
 drtables.o:      $(HDRS) drtables.c
 
-# We depend upon object files built as part of building the lookups library
-# When using parallel make, we don't have the dependency to force building
-# in the sub-directory unless we force that dependency:
+# Some sources live in the lookups, routers or auths directory
+
+$(OBJ_LOOKUPS) $(OBJ_ROUTERS) $(OBJ_AUTHS):    $(HDRS)
+
+$(OBJ_LOOKUPS):	lookups/lf_functions.h
+lf_check_file.o: lookups/lf_check_file.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+lf_quote.o:      lookups/lf_quote.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+lf_sqlperform.o: lookups/lf_sqlperform.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+
+$(OBJ_ROUTERS):	routers/rf_functions.h
+rf_change_domain.o:      routers/rf_change_domain.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_expand_data.o:        routers/rf_expand_data.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_get_errors_address.o: routers/rf_get_errors_address.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_get_munge_headers.o:  routers/rf_get_munge_headers.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_get_transport.o:      routers/rf_get_transport.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_get_ugid.o:           routers/rf_get_ugid.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_lookup_hostlist.o:    routers/rf_lookup_hostlist.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_queue_add.o:          routers/rf_queue_add.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_self_action.o:        routers/rf_self_action.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+rf_set_ugid.o:           routers/rf_set_ugid.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+
+auth-spa.o:         auths/auth-spa.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+call_pwcheck.o:     auths/call_pwcheck.c auths/pwcheck.h
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+check_serv_cond.o:  auths/check_serv_cond.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+get_data.o:         auths/get_data.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+get_no64_data.o:    auths/get_no64_data.c
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+pwcheck.o:          auths/pwcheck.c auths/pwcheck.h
+	@echo "$(CC) $<"
+	$(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $<
+
 
-$(OBJ_LOOKUPS):  buildlookups
 
 # The exim monitor's private modules - the sources live in a private
 # subdirectory. The final binary combines the private modules with some
@@ -879,13 +997,26 @@ em_text.o:       ../exim_monitor/em_text.c    ../exim_monitor/em_hdr.h
 em_xs.o:         ../exim_monitor/em_xs.c      ../exim_monitor/em_hdr.h
 em_version.o:    ../exim_monitor/em_version.c ../exim_monitor/em_hdr.h
 $(MONBIN): $(HDRS)
-		 @echo "$(CC) exim_monitor/`echo $@ | sed 's/o$$/c/'`"
-		 $(FE)$(CC) -o $@ -c $(CFLAGS) -I. -I../exim_monitor $(INCLUDE) $(XINCLUDE) \
-		   ../exim_monitor/`echo $@ | sed 's/o$$/c/'`
+		 @echo "$(CC) exim_monitor/$(@:.o=.c)"
+		 $(FE)$(CC) -o $@ -c $(CFLAGS) -DCOMPILE_UTILITY -I. -I../exim_monitor $(INCLUDE) $(XINCLUDE) \
+		   ../exim_monitor/$(@:.o=.c)
 
 
 # Targets for the various libraries that Exim uses.
 
+# Copies of modules built as dynamic-load libraries
+
+dynmodules: buildlookups buildrouters buildtransports buildauths \
+		buildmisc
+	rm -fr dynmodules
+	mkdir dynmodules
+	for d in lookup router transport auth miscmod; do \
+	  for f in $${d}s/*.so; do \
+	    [ -e $$f ] && ln $$f dynmodules/`basename $$f .so`_$$d.so; \
+	  done; \
+	done; \
+	true
+
 # The lookups library.
 
 buildlookups: config
@@ -899,6 +1030,7 @@ buildlookups: config
 
 buildrouters: config
 	 @cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
+	   CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
 	   FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
 	   INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
 	 @echo " "
@@ -907,6 +1039,7 @@ buildrouters: config
 
 buildtransports: config
 	 @cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
+	   CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
 	   FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
 	   INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
 	 @echo " "
@@ -915,17 +1048,20 @@ buildtransports: config
 
 buildauths: config
 	 @cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
+	   CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
 	   FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
 	   INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
 	 @echo " "
 
-# The PDKIM library
-
-buildpdkim: pdkim/pdkim.a
-pdkim/pdkim.a: config
-	 @cd pdkim && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
-	   FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
-	   INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
+buildmisc: config
+	 @cd miscmods && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) \
+	   CC="$(CC)" CFLAGS="$(CFLAGS)" \
+	     CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
+	     LDFLAGS_PARTIAL="$(LDFLAGS_PARTIAL)" HDRS="../version.h $(PHDRS)" \
+	     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)"
 	 @echo " "
 
 # The "clean", "install", and "makefile" targets just pass themselves back to
@@ -964,13 +1100,13 @@ test_dbfn:   config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \
 	rm -f dbfn.o store.o
 
 test_host:   config.h child.c host.c dns.c dummies.c sa-globals.o os.o \
-	       store.o string.o tod.o tree.o
+	       host_address.o store.o string.o tod.o tree.o
 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST child.c
 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c
 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c
 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c
 	$(LNCC) -o test_host $(LFLAGS) \
-	  host.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \
+	  host.o host_address.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \
 	  tod.o tree.o $(LIBS) $(LIBRESOLV)
 	rm -f child.o dummies.o host.o dns.o