Build: tidying

diff --git a/src/Makefile b/src/Makefile
index 7b1434a5929e28966d57ac8f5b0908b5b09af76c..86d6f083fa7b32293dcaac5d9e446f140f15d210 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -89,17 +89,17 @@ install:        all
 
 # Tidy-up targets
 
 
 # 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 ""
        @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*
 
 
 distclean:; $(RM_COMMAND) -rf build-* cscope*
 

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index c27b5eb5c2569badaea29482695999678a7b0083..dbd8f7ac9fd9dc772541795dcc0de4d314949932 100644 (file)
--- 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)" \
             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
         @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 6aa0824842e48d5e0b8c5cb9691449268db1883b..a598230842aeb1da3a1e8eb2f351a13b841c43e6 100644 (file)
--- 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) 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
        $(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) \
        @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
                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 44f2e12acb0eaec5ed2f7751cf2fe38442063d8f..d8e77028c71a73838af0a870b299f2c1ae44de26 100644 (file)
--- 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
 #ifndef DISABLE_DKIM   /* rest of file */
 
 #ifdef DISABLE_TLS

-# error Must no DISABLE_TLS, for DKIM
+# error Must not DISABLE_TLS, for DKIM

 #endif
 
 
 #endif