Taint: reject or log more tainted list metadata elements

[exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index d190d9aa06768a03cd349d732ebfa984b2db55b3..86d6f083fa7b32293dcaac5d9e446f140f15d210 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@
 # appropriate links, and then creating and running the main makefile in that
 # directory.
 
-# Copyright (c) The Exim Maintainers 2022
+# 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.
@@ -37,10 +37,12 @@ all: Local/Makefile configure
        @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 ""
@@ -87,17 +89,17 @@ install:        all
 
 # Tidy-up targets
 
-clean:; @echo ""; echo '*** "make clean" just removes all .o and .a files'
+clean_exim:; cd build-$(buildname); \
+       $(RM_COMMAND) -f *.o; \
+       for d in lookups auths routers transports miscmods; do \
+               $(RM_COMMAND) -f $$d/*.{o,a,so}; \
+       done; \
+       $(RM_COMMAND) -fr dynmodules
+
+clean: clean_exim
+       @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); \
-       $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
-       routers/*.o routers/*.a transports/*.o transports/*.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 lookups/*.so
 
 distclean:; $(RM_COMMAND) -rf build-* cscope*