SECURITY: DMARC uses From header untrusted data

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

diff --git a/src/Makefile b/src/Makefile
index 8ad750d74ea73bee2921219480ffd5752ac4f983..b4f04b2e4cbf0a50910e51983d85370c29766314 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,3 @@
-# $Cambridge: exim/src/Makefile,v 1.7 2009/11/16 19:50:36 nm4 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.
 # Top-level makefile for Exim; handles creating a build directory with
 # appropriate links, and then creating and running the main makefile in that
 # directory.


@@ -47,28 +45,30 @@ build-directory:
        $(SHELL) -c "test -d $$builddir -a -r $$builddir/version.c || \
          (mkdir $$builddir; cd $$builddir; $(SHELL) ../scripts/MakeLinks)";
 
        $(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.
 
 # 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); \
        @cd build-$(buildname); \

-         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
-         $(SHELL) ../scripts/lookups-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile

 
 # The "makefile" target forces a rebuild of the makefile (as opposed to
 # "configure", which doesn't force it).
 
 makefile: build-directory
        @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \
 
 # The "makefile" target forces a rebuild of the makefile (as opposed to
 # "configure", which doesn't force it).
 
 makefile: build-directory
        @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \

-         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
-         $(SHELL) ../scripts/lookups-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile

 
 # The installation commands are kept in a separate script, which expects
 # to be run from inside the build directory.
 
 
 # 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
                build=$(build) $(SHELL) ../scripts/exim_install $(INSTALL_ARG)
 
 # Tidy-up targets


@@ -85,6 +85,15 @@ 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
 
         $(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-*
+distclean:; $(RM_COMMAND) -rf build-* cscope*
+
+cscope.files: FRC
+       echo "-q" > $@
+       echo "-p3" >> $@
+       find src Local -name "*.[cshyl]" -print \
+                   -o -name "*akefile*" -print \
+                   -o -name EDITME -print >> $@
+
+FRC:

 
 # End of top-level makefile
 
 # End of top-level makefile