Merge branch 'ocsp_staple_rollup'

[exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index cf7968db0f3a7e1c09ca03a0ada529767a0302d3..a18c3d7289356646b574913fd454df540e3b4482 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,8 @@
-# $Cambridge: exim/src/Makefile,v 1.5 2008/02/14 13:49:35 fanf2 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.
 

-# Copyright (c) 2004 University of Cambridge.
+# Copyright (c) University of Cambridge, 1995 - 2007

 # 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


@@ -66,7 +64,8 @@ makefile: build-directory
 # 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


@@ -77,11 +76,11 @@ clean:; @echo ""; echo '*** "make clean" just removes all .o and .a files'
        cd build-$(buildname); \
        $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
        routers/*.o routers/*.a transports/*.o transports/*.a \
        cd build-$(buildname); \
        $(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); \
         $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.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
+       routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so

 
 distclean:; $(RM_COMMAND) -rf build-*
 
 
 distclean:; $(RM_COMMAND) -rf build-*