Merge branch 'master' of ssh://git.exim.org/home/git/exim

[exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 8702df9fbb4d8a2a5a42b6494bbeda50eac3ed0b..ec573b5d64a48255ac274e0e85b9e7436543199b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,8 @@
-# $Cambridge: exim/src/Makefile,v 1.3 2005/09/12 13:50:03 ph10 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
@@ -27,7 +25,8 @@ buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}
 # The default target checks for the existence of Local/Makefile, that the main
 # makefile is built and up-to-date, and then it runs it.
 
-all: Local/Makefile configure go
+all: Local/Makefile configure
+       @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
 Local/Makefile:
        @echo ""
@@ -46,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
 
@@ -62,14 +64,11 @@ makefile: build-directory
        @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \
          build=$(build) $(SHELL) ../scripts/Configure-Makefile
 
-# Go to the build directory and do the business
-
-go:; @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
-
 # 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
@@ -80,10 +79,12 @@ clean:; @echo ""; echo '*** "make clean" just removes all .o and .a files'
        cd build-$(buildname); \
        $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
        routers/*.o routers/*.a transports/*.o transports/*.a \
-       pcre/*.o pcre/*.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
+       routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so
+
+distclean:; $(RM_COMMAND) -rf build-*
 
 # End of top-level makefile