Config conflict checking vs. USE_SQLITE

[exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 3aa3cc374122b01106db6a370a58e3f60ee6dc27..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) The Exim Maintainers 2022 - 2023

 # Copyright (c) University of Cambridge, 1995 - 2018
 # 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


@@ -35,10 +37,12 @@ all: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
 # This pair for the convenience of of the Debian maintainers
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
 # 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 ""


@@ -102,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 \