Remove ACL-config skip so that ${acl } expansions work from queue-runs.

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

diff --git a/src/Makefile b/src/Makefile
index 0a48ff905d1049ca9c93ec22ddfebdd030f3e0be..ec573b5d64a48255ac274e0e85b9e7436543199b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,3 @@
-# $Cambridge: exim/src/Makefile,v 1.7 2009/11/16 19:50:36 nm4 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.
@@ -47,12 +45,15 @@ build-directory:
        $(SHELL) -c "test -d $$builddir -a -r $$builddir/version.c || \
          (mkdir $$builddir; cd $$builddir; $(SHELL) ../scripts/MakeLinks)";
 
+checks:
+       $(SHELL) scripts/source_checks
+
 # The "configure" target ensures that the build directory exists, then arranges
 # to build the main makefile from inside the build directory, by calling the
 # Configure-Makefile script. This does its own dependency checking because of
 # the optional files.
 
-configure: build-directory
+configure: checks build-directory
        @cd build-$(buildname); \
          build=$(build) $(SHELL) ../scripts/Configure-Makefile
 
@@ -66,7 +67,8 @@ makefile: build-directory
 # 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 +83,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-*