Make test-suite client cmd -t<timeout> actually work

[exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 463955ccfeeee86786d03e6f1b7d3301b7700dd1..4c8300ca7a4327ba3ddd9864e0a22de975b258a1 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,8 @@
-# $Cambridge: exim/src/Makefile,v 1.2 2004/10/11 13:24:19 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
@@ -13,6 +11,7 @@
 # or "make" must be called with a different SHELL= setting.
 
 SHELL=/bin/sh
+RM_COMMAND=/bin/rm
 
 # If a build name has not been specified by running this make file via a
 # command of the form "make build=xxxx", then determine the name of the
@@ -26,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 ""
@@ -52,23 +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); /bin/rm -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)
+       @cd build-$(buildname); $(RM_COMMAND) -f 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
@@ -77,12 +76,14 @@ clean:; @echo ""; echo '*** "make clean" just removes all .o and .a files'
        @echo '*** Use "make makefile" to force a rebuild of the makefile'
        @echo ""
        cd build-$(buildname); \
-       /bin/rm -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
+       $(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); \
-        /bin/rm -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
-       routers/*.o routers/*.a transports/*.o transports/*.a
+        $(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-*
 
 # End of top-level makefile