exim-filter dynamic module

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

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 05979f6cb7710da70d36bff1ba301f603818e8e9..c27b5eb5c2569badaea29482695999678a7b0083 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -221,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-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-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 $@"
 
 macro_predef: $(OBJ_MACRO)
        @echo "$(LNCC) -o $@"


@@ -244,8 +244,8 @@ macro.c: macro_predef
 # problem, but it does no harm. Other make programs will just ignore this.
 
 .PHONY: all config utils \
 # problem, but it does no harm. Other make programs will just ignore this.
 
 .PHONY: all config utils \

-       buildauths buildlookups buildpdkim buildrouters \
-        buildtransports dynmodules checklocalmake clean
+       buildauths buildlookups buildrouters \
+        buildtransports buildmisc dynmodules checklocalmake clean

 
 
 utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \
 
 
 utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \


@@ -495,49 +495,43 @@ transport-filter.pl: config ../src/transport-filter.src
 # are thrown away by the linker.
 
 OBJ_WITH_CONTENT_SCAN = malware.o mime.o regex.o spam.o spool_mbox.o
 # 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 \
                        dane.o \
                        dcc.o \

-                       dmarc.o \

                        imap_utf7.o \
                        imap_utf7.o \

-                       spf.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.
 
                        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_ROUTERS = routers/rf_change_domain.o routers/rf_expand_data.o \
-       routers/rf_get_errors_address.o \
-       routers/rf_get_munge_headers.o routers/rf_get_transport.o \
-       routers/rf_get_ugid.o routers/rf_lookup_hostlist.o \
-       routers/rf_queue_add.o routers/rf_self_action.o routers/rf_set_ugid.o
-OBJ_AUTHS = auths/auth-spa.o auths/call_pam.o auths/call_pwcheck.o \
-       auths/call_radius.o auths/check_serv_cond.o auths/get_data.o \
-       auths/get_no64_data.o auths/pwcheck.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 \
 
 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 \
+        directory.o dns.o drtables.o enq.o exim.o expand.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 \
         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 \
+        route.o search.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 \
         xtextencode.o environment.o macro.o \
         $(OBJ_LOOKUPS) $(OBJ_ROUTERS) $(OBJ_AUTHS) \
         std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \
         xtextencode.o environment.o macro.o \
         $(OBJ_LOOKUPS) $(OBJ_ROUTERS) $(OBJ_AUTHS) \

-        local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
+        local_scan.o $(OBJ_WITH_CONTENT_SCAN) \

         $(OBJ_EXPERIMENTAL)
 
         $(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 \
         $(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)
          $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
          $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \
          $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS)


@@ -690,6 +684,10 @@ HDRS  =    blob.h \
        hintsdb/hints_tdb.h \
        local_scan.h \
        macros.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 \
        mytypes.h \
        path_max.h \
        sha_ver.h \


@@ -709,6 +707,10 @@ PHDRS = ../config.h \
        ../hintsdb/hints_tdb.h \
        ../local_scan.h \
        ../macros.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 \
        ../mytypes.h \
        ../path_max.h \
        ../structs.h \


@@ -736,12 +738,6 @@ version.o: $(HDRS) cnumber.h version.h version.c
 
 dummies.o:       dummies.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
 # Compile instructions for the database utility modules
 
 exim_dumpdb.o:   $(HDRS) exim_dbutil.c


@@ -843,7 +839,6 @@ enq.o:           $(HDRS) enq.c
 exim.o:          $(HDRS) exim.c
 expand.o:        $(HDRS) expand.c
 environment.o:   $(HDRS) environment.c
 exim.o:          $(HDRS) exim.c
 expand.o:        $(HDRS) expand.c
 environment.o:   $(HDRS) environment.c

-filter.o:        $(HDRS) filter.c

 filtertest.o:    $(HDRS) filtertest.c
 globals.o:       $(HDRS) globals.c
 hash.o:          $(HDRS) hash.c
 filtertest.o:    $(HDRS) filtertest.c
 globals.o:       $(HDRS) globals.c
 hash.o:          $(HDRS) hash.c


@@ -870,7 +865,6 @@ 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

-sieve.o:         $(HDRS) sieve.c

 smtp_in.o:       $(HDRS) smtp_in.c
 smtp_out.o:      $(HDRS) smtp_out.c
 spool_in.o:      $(HDRS) spool_in.c
 smtp_in.o:       $(HDRS) smtp_in.c
 smtp_out.o:      $(HDRS) smtp_out.c
 spool_in.o:      $(HDRS) spool_in.c


@@ -887,8 +881,6 @@ transport.o:     $(HDRS) transport.c
 tree.o:          $(HDRS) tree.c
 verify.o:        $(HDRS) transports/smtp.h verify.c
 xtextencode.o:   $(HDRS) xtextencode.c
 tree.o:          $(HDRS) tree.c
 verify.o:        $(HDRS) transports/smtp.h verify.c
 xtextencode.o:   $(HDRS) xtextencode.c

-dkim.o:          $(HDRS) pdkim/pdkim.h dkim.c
-dkim_transport.o: $(HDRS) dkim_transport.c

 
 # Dependencies for WITH_CONTENT_SCAN modules
 
 
 # Dependencies for WITH_CONTENT_SCAN modules
 


@@ -901,13 +893,10 @@ spool_mbox.o:    $(HDRS) spool_mbox.c
 
 # Dependencies for EXPERIMENTAL_* modules
 
 
 # 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
 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
 imap_utf7.o:   $(HDRS) imap_utf7.c

-spf.o:         $(HDRS) spf.h spf.c

 utf8.o:                $(HDRS) utf8.c
 xclient.o:     $(HDRS) xclient.c
 
 utf8.o:                $(HDRS) utf8.c
 xclient.o:     $(HDRS) xclient.c
 


@@ -921,13 +910,73 @@ xclient.o:        $(HDRS) xclient.c
 
 drtables.o:      $(HDRS) drtables.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
-$(OBJ_ROUTERS):  buildrouters
-$(OBJ_AUTHS):    buildauths

 
 # The exim monitor's private modules - the sources live in a private
 # subdirectory. The final binary combines the private modules with some
 
 # The exim monitor's private modules - the sources live in a private
 # subdirectory. The final binary combines the private modules with some


@@ -955,10 +1004,11 @@ $(MONBIN): $(HDRS)
 
 # Copies of modules built as dynamic-load libraries
 
 
 # Copies of modules built as dynamic-load libraries
 

-dynmodules: buildlookups buildrouters buildtransports buildauths
+dynmodules: buildlookups buildrouters buildtransports buildauths \
+               buildmisc

        rm -fr dynmodules
        mkdir dynmodules
        rm -fr dynmodules
        mkdir dynmodules

-       for d in lookup router transport auth; do \
+       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; \
          for f in $${d}s/*.so; do \
            [ -e $$f ] && ln $$f dynmodules/`basename $$f .so`_$$d.so; \
          done; \


@@ -1001,13 +1051,15 @@ buildauths: config
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
         @echo " "
 
           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
         @echo " "
 
 # The "clean", "install", and "makefile" targets just pass themselves back to