Lose extraneous line

[users/jgh/exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 463955ccfeeee86786d03e6f1b7d3301b7700dd1..9583062922925fad50f4fbdc7a25db928caa0bf8 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,8 @@
-# $Cambridge: exim/src/Makefile,v 1.2 2004/10/11 13:24:19 ph10 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) 2004 University of Cambridge.
+# Copyright (c) University of Cambridge, 1995 - 2017
 # 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,6 +11,7 @@
 # or "make" must be called with a different SHELL= setting.
 
 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
@@ -20,13 +19,28 @@ SHELL=/bin/sh
 # 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
 # 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*.
 
-buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}
+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.
 
-all: Local/Makefile configure go
+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
+
 
 Local/Makefile:
        @echo ""
@@ -45,12 +59,15 @@ 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
 
@@ -58,17 +75,14 @@ configure: build-directory
 # "configure", which doesn't force it).
 
 makefile: build-directory
-       @cd build-$(buildname); /bin/rm -f Makefile; \
+       @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \
          build=$(build) $(SHELL) ../scripts/Configure-Makefile
 
-# Go to the build directory and do the business
-
-go:; @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
-
 # 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
@@ -77,12 +91,25 @@ clean:; @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); \
-       /bin/rm -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
+       $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
        routers/*.o routers/*.a transports/*.o transports/*.a \
-       pcre/*.o pcre/*.a
+       pdkim/*.o pdkim/*.a
 
 clean_exim:; cd build-$(buildname); \
-        /bin/rm -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
-       routers/*.o routers/*.a transports/*.o transports/*.a
+        $(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*
+
+cscope.files: FRC
+       echo "-q" > $@
+       echo "-p3" >> $@
+       find src Local OS exim_monitor -name "*.[cshyl]" -print \
+                   -o -name "os.[ch]*" -print \
+                   -o -name "*akefile*" -print \
+                   -o -name config.h.defaults -print \
+                   -o -name EDITME -print >> $@
+
+FRC:
 
 # End of top-level makefile