Testsuite: avoid retry db issue after deliberate fail subtests

[exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 8ad750d74ea73bee2921219480ffd5752ac4f983..adda7ceb3359d6f8bb27d9879c99e9275dff0895 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,8 @@
-# $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.
 
-# Copyright (c) University of Cambridge, 1995 - 2007
+# Copyright (c) University of Cambridge, 1995 - 2015
 # See the file NOTICE for conditions of use and distribution.
 
 # IRIX make uses the shell that is in the SHELL variable, which often defaults
@@ -30,6 +28,14 @@ buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}
 all: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
+
+# This pair for the convinience of of the Debian maintainers
+exim: Local/Makefile configure
+       @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) exim
+utils: Local/Makefile configure
+       @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) utils
+
+
 Local/Makefile:
        @echo ""
        @echo "*** Please create Local/Makefile by copying src/EDITME and making"
@@ -47,28 +53,30 @@ 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; \
-         $(SHELL) ../scripts/lookups-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-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; \
-         $(SHELL) ../scripts/lookups-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-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
@@ -85,6 +93,18 @@ 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-*
+distclean:; $(RM_COMMAND) -rf build-* cscope*
+
+cscope.files: FRC
+       echo "-q" > $@
+       echo "-p3" >> $@
+       find src Local OS exim_monitor -name "*.[cshyl]" -print \
+                   -o -name "os.h*" -print \
+                   -o -name "*akefile*" -print \
+                   -o -name config.h.defaults -print \
+                   -o -name EDITME -print >> $@
+       ls OS/* >> $@
+
+FRC:
 
 # End of top-level makefile