Regex compile cacheing

[exim.git] / src / OS / Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 77fb3474298a3fa399c0f252395ee6c749785a32..0c64d45d4ae2a7b403ad99f5bef82ad5a4cc304a 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -1,12 +1,12 @@
 # This file is the basis of the main makefile for Exim and friends. The
 # This file is the basis of the main makefile for Exim and friends. The

+#

 # makefile at the top level arranges to build the main makefile by calling
 # scripts/Configure-Makefile from within the build directory. This
 # concatenates the configuration settings from Local/Makefile and other,
 # optional, Local/* files at the front of this file, to create Makefile in the
 # build directory.
 #
 # makefile at the top level arranges to build the main makefile by calling
 # scripts/Configure-Makefile from within the build directory. This
 # concatenates the configuration settings from Local/Makefile and other,
 # 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 2020
+# Copyright (c) The Exim Maintainers 1995 - 2022

 
 SHELL      = $(MAKE_SHELL)
 SCRIPTS    = ../scripts
 
 SHELL      = $(MAKE_SHELL)
 SCRIPTS    = ../scripts


@@ -81,7 +81,6 @@ Makefile: ../OS/Makefile-Base ../OS/Makefile-Default \
 # Build (link) the os.h file
 
 os.h:  $(SCRIPTS)/Configure-os.h \
 # Build (link) the os.h file
 
 os.h:  $(SCRIPTS)/Configure-os.h \

-       $(O)/os.h-Darwin        \

        $(O)/os.h-FreeBSD       \
        $(O)/os.h-GNU           \
        $(O)/os.h-Linux         \
        $(O)/os.h-FreeBSD       \
        $(O)/os.h-GNU           \
        $(O)/os.h-Linux         \


@@ -113,7 +112,7 @@ MACRO_HSRC = macro_predef.h os.h globals.h config.h macros.h \
 
 OBJ_MACRO = macro_predef.o \
        macro-globals.o macro-readconf.o macro-route.o macro-transport.o macro-drtables.o \
 
 OBJ_MACRO = macro_predef.o \
        macro-globals.o macro-readconf.o macro-route.o macro-transport.o macro-drtables.o \

-       macro-tls.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-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 \


@@ -141,6 +140,9 @@ 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-drtables.o :     drtables.c
        @echo "$(CC) -DMACRO_PREDEF drtables.c"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ drtables.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-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


@@ -474,7 +476,6 @@ OBJ_EXPERIMENTAL =  arc.o \
                        dmarc.o \
                        imap_utf7.o \
                        spf.o \
                        dmarc.o \
                        imap_utf7.o \
                        spf.o \

-                       srs.o \

                        utf8.o
 
 # Targets for final binaries; the main one has a build number which is
                        utf8.o
 
 # Targets for final binaries; the main one has a build number which is


@@ -485,9 +486,9 @@ OBJ_LOOKUPS = lookups/lf_quote.o lookups/lf_check_file.o lookups/lf_sqlperform.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 dnsbl.o hash.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 dnsbl.o hash.o \

-        header.o host.o ip.o log.o lss.o match.o md5.o moan.o \
-        os.o parse.o queue.o \
-        rda.o readconf.o receive.o retry.o rewrite.o rfc2047.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 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 \
         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 \


@@ -601,10 +602,11 @@ 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.
 
 # 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-store.o \
             util-string.o \

-            util-queue.o \

             util-tod.o \
             util-tree.o \
             $(MONBIN)
             util-tod.o \
             util-tree.o \
             $(MONBIN)


@@ -635,11 +637,12 @@ eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) ../exim_monitor/em_version.c \
 HDRS  =        blob.h \
        config.h \
        dbfunctions.h \
 HDRS  =        blob.h \
        config.h \
        dbfunctions.h \

-       dbstuff.h \

        exim.h \
        functions.h \
        globals.h \
        hash.h \
        exim.h \
        functions.h \
        globals.h \
        hash.h \

+       hintsdb.h \
+       hintsdb_structs.h \

        local_scan.h \
        macros.h \
        mytypes.h \
        local_scan.h \
        macros.h \
        mytypes.h \


@@ -648,10 +651,11 @@ HDRS  =   blob.h \
        os.h
 PHDRS = ../config.h \
        ../dbfunctions.h \
        os.h
 PHDRS = ../config.h \
        ../dbfunctions.h \

-       ../dbstuff.h \

        ../exim.h \
        ../functions.h \
        ../globals.h \
        ../exim.h \
        ../functions.h \
        ../globals.h \

+       ../hintsdb.h \
+       ../hintsdb_structs.h \

        ../local_scan.h \
        ../macros.h \
        ../mytypes.h \
        ../local_scan.h \
        ../macros.h \
        ../mytypes.h \


@@ -719,6 +723,14 @@ exim_dbmbuild.o: $(HDRS) exim_dbmbuild.c
 # Utilities use special versions of some modules - typically with debugging
 # calls cut out.
 
 # 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
 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


@@ -731,10 +743,6 @@ util-string.o:   $(HDRS) string.c
        @echo "$(CC) -DCOMPILE_UTILITY string.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-string.o string.c
 
        @echo "$(CC) -DCOMPILE_UTILITY string.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-string.o string.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-queue.o:   $(HDRS) queue.c
        @echo "$(CC) -DCOMPILE_UTILITY queue.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-queue.o queue.c
 util-queue.o:   $(HDRS) queue.c
        @echo "$(CC) -DCOMPILE_UTILITY queue.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-queue.o queue.c


@@ -785,6 +793,7 @@ globals.o:       $(HDRS) globals.c
 hash.o:          $(HDRS) hash.c
 header.o:        $(HDRS) header.c
 host.o:          $(HDRS) host.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
 ip.o:            $(HDRS) ip.c
 log.o:           $(HDRS) log.c
 lss.o:           $(HDRS) lss.c


@@ -793,12 +802,14 @@ md5.o:           $(HDRS) md5.c
 moan.o:          $(HDRS) moan.c
 os.o:            $(HDRS) $(OS_C_INCLUDES) os.c
 parse.o:         $(HDRS) parse.c
 moan.o:          $(HDRS) moan.c
 os.o:            $(HDRS) $(OS_C_INCLUDES) os.c
 parse.o:         $(HDRS) parse.c

+priv.o:          $(HDRS) priv.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
 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
 rfc2047.o:       $(HDRS) rfc2047.c
 route.o:         $(HDRS) route.c
 search.o:        $(HDRS) search.c


@@ -839,7 +850,6 @@ 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
 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
 
 # The module containing tables of available lookups, routers, auths, and
 utf8.o:                $(HDRS) utf8.c
 
 # The module containing tables of available lookups, routers, auths, and


@@ -960,13 +970,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 \
        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) \
        $(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
 
          tod.o tree.o $(LIBS) $(LIBRESOLV)
        rm -f child.o dummies.o host.o dns.o