Added tls_dh_max_bits & check tls_require_ciphers early.

[users/jgh/exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index ec2856e0e8f4c19685fbb4a71f14f4aaba1fd6e4..4c8300ca7a4327ba3ddd9864e0a22de975b258a1 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,8 @@
-# $Cambridge: exim/src/Makefile,v 1.6 2009/06/10 07:34:04 tom Exp $
-
 # Top-level makefile for Exim; handles creating a build directory with
 # appropriate links, and then creating and running the main makefile in that
 # directory.
 
-# Copyright (c) 2004 University of Cambridge.
+# Copyright (c) University of Cambridge, 1995 - 2007
 # See the file NOTICE for conditions of use and distribution.
 
 # IRIX make uses the shell that is in the SHELL variable, which often defaults
@@ -54,19 +52,22 @@ build-directory:
 
 configure: build-directory
        @cd build-$(buildname); \
-         build=$(build) $(SHELL) ../scripts/Configure-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
+         $(SHELL) ../scripts/lookups-Makefile
 
 # The "makefile" target forces a rebuild of the makefile (as opposed to
 # "configure", which doesn't force it).
 
 makefile: build-directory
        @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \
-         build=$(build) $(SHELL) ../scripts/Configure-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
+         $(SHELL) ../scripts/lookups-Makefile
 
 # The installation commands are kept in a separate script, which expects
 # to be run from inside the build directory.
 
-install:;      @cd build-$(buildname); \
+install:        all
+               @cd build-$(buildname); \
                build=$(build) $(SHELL) ../scripts/exim_install $(INSTALL_ARG)
 
 # Tidy-up targets
@@ -81,7 +82,7 @@ clean:; @echo ""; echo '*** "make clean" just removes all .o and .a files'
 
 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
+       routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so
 
 distclean:; $(RM_COMMAND) -rf build-*