Fix 2-phase, in-order queue run delivery order

[exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index b262a7b53792c3884cd9f6e2561cda0effaee30d..7b1434a5929e28966d57ac8f5b0908b5b09af76c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,9 @@
 # appropriate links, and then creating and running the main makefile in that
 # directory.
 
 # appropriate links, and then creating and running the main makefile in that
 # directory.
 

-# Copyright (c) University of Cambridge, 1995 - 2015
+# Copyright (c) The Exim Maintainers 2022 - 2023
+# Copyright (c) University of Cambridge, 1995 - 2018
+# SPDX-License-Identifier: GPL-2.0-or-later

 # See the file NOTICE for conditions of use and distribution.
 
 # IRIX make uses the shell that is in the SHELL variable, which often defaults
 # 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,34 +15,34 @@
 SHELL=/bin/sh
 RM_COMMAND=/bin/rm
 
 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
-# operating system and the machine architecture and use that. This does not
-# provide an override for the OS type and architecture type; they still have
-# to be used for the OS-specific files. To override them, you can set the
+# The buildname defaults to "<os-type>-<arch-type>". It can be
+# overridden by the "build" parameter when invoking make (e.g. make
+# build=xxx) This does not provide an override for the OS type and
+# architecture type used during the build process; they still have to be
+# used for the OS-specific files. To override them, you can set the

 # shell variables OSTYPE and ARCHTYPE when running make.
 #
 # shell variables OSTYPE and ARCHTYPE when running make.
 #

-# EXIM_BUILD_SUFFIX should be used to enable parallel builds on a file
-# system shared among different Linux distros (same os-type, same
-# arch-type). The ../test/runtest script is expected to honour the
-# EXIM_BUILD_SUFFIX when searching the Exim binary.
-# NOTE: EXIM_BUILD_SUFFIX is considered *experimental*.
+# EXIM_BUILD_SUFFIX gets appended to the buildname.  (This enables
+# parallel builds on a file system shared among different Linux distros
+# (same os-type, same arch-type). The ../test/runtest script honours the
+# EXIM_BUILD_SUFFIX when searching the Exim binary.)

 
 buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}$${EXIM_BUILD_SUFFIX:+.$$EXIM_BUILD_SUFFIX}
 
 # 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.
 
 buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}$${EXIM_BUILD_SUFFIX:+.$$EXIM_BUILD_SUFFIX}
 
 # 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.

+# If Local/Makefile-<buildname> exists, it is read too.

 
 all: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
 
 all: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 

-

 # This pair for the convenience of of the Debian maintainers
 # This pair for the convenience 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
+exim utils: Local/Makefile configure
+       @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) $@

 
 

+# For testsuite builds
+exim_openssl exim_gnutls: Local/Makefile configure
+       @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) $@

 
 Local/Makefile:
        @echo ""
 
 Local/Makefile:
        @echo ""


@@ -104,6 +106,7 @@ distclean:; $(RM_COMMAND) -rf build-* cscope*
 cscope.files: FRC
        echo "-q" > $@
        echo "-p3" >> $@
 cscope.files: FRC
        echo "-q" > $@
        echo "-p3" >> $@

+       -bd=build-$(buildname); [ -d $$bd ] && echo -e "$$bd/config.h\n$$bd/Makefile" >> $@

        find src Local OS exim_monitor -name "*.[cshyl]" -print \
                    -o -name "os.[ch]*" -print \
                    -o -name "*akefile*" -print \
        find src Local OS exim_monitor -name "*.[cshyl]" -print \
                    -o -name "os.[ch]*" -print \
                    -o -name "*akefile*" -print \