From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 18 Jan 2015 21:36:34 +0000 (+0000)
Subject: Separate make targets for utils and exim.  Bug 610
X-Git-Tag: exim-4_86_RC1~138
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=8497e842ec8a55daad7ce936aedf01227fa0f4d1

Separate make targets for utils and exim.  Bug 610
---

diff --git a/src/Makefile b/src/Makefile
index 96c0d58ee..bdcfe5a5f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,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"
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index f82549ded..38d719837 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -32,7 +32,7 @@ FE       = $(FULLECHO)
 # up-to-date. Then the os-specific source files and the C configuration file
 # are set up, and finally it goes to the main Exim target.
 
-all:       allexim
+all:       utils exim
 config:    $(EDITME) checklocalmake Makefile os.h os.c config.h version.h
 
 checklocalmake:
@@ -95,19 +95,16 @@ config.h: Makefile buildconfig ../src/config.h.defaults $(EDITME)
 # therefore always be run, even if the files exist. This shouldn't in fact be a
 # problem, but it does no harm. Other make programs will just ignore this.
 
-.PHONY: all config allexim buildauths buildlookups buildpdkim buildrouters \
+.PHONY: all config utils \
+	buildauths buildlookups buildpdkim buildrouters \
         buildtransports checklocalmake clean
 
 
-# This is the real default target for all the various exim binaries and
-# scripts, once the configuring stuff is done.
-
-allexim: $(EXIM_MONITOR) exicyclog exinext exiwhat \
+utils: $(EXIM_MONITOR) exicyclog exinext exiwhat \
         exigrep eximstats exipick exiqgrep exiqsumm \
         transport-filter.pl convert4r3 convert4r4 \
         exim_checkaccess \
-        exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \
-        exim
+        exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock
 
 
 # Targets for special-purpose configuration header builders