arc dynamic module

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

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 2e8728ae2c5fa6c09922a55c957f7a8934573f79..857c44776726d248e691d0ec067332be4d4fcbe0 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,13 +495,10 @@ 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
 
                        utf8.o \
                        xclient.o
 


@@ -517,7 +514,7 @@ OBJ_AUTHS = call_pam.o call_pwcheck.o call_radius.o check_serv_cond.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 \
 
 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 \
+        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 \


@@ -528,13 +525,13 @@ OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_EXPERIMENTAL)
 
         local_scan.o $(EXIM_PERL) $(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 \
         $(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)


@@ -687,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 \


@@ -706,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 \


@@ -884,8 +889,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
 


@@ -898,13 +901,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
 


@@ -1018,10 +1018,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; \


@@ -1064,13 +1065,12 @@ 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)" HDRS="../version.h $(PHDRS)" \
+            FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \
+            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