Moved variable decl to start of block for old gcc

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

diff --git a/src/Makefile b/src/Makefile
index c1233fced619cdaceb3b1534ce80f8f6b6c20e68..8ad750d74ea73bee2921219480ffd5752ac4f983 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,10 @@
-# $Cambridge: exim/src/Makefile,v 1.4 2005/09/12 13:55:54 ph10 Exp $
+# $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.
 
-# 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
@@ -27,7 +27,8 @@ buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}
 # 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)
 
 Local/Makefile:
        @echo ""
@@ -53,18 +54,16 @@ build-directory:
 
 configure: build-directory
        @cd build-$(buildname); \
-         build=$(build) $(SHELL) ../scripts/Configure-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
+         $(SHELL) ../scripts/lookups-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
-
-# Go to the build directory and do the business
-
-go:; @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
+         $(SHELL) ../scripts/lookups-Makefile
 
 # The installation commands are kept in a separate script, which expects
 # to be run from inside the build directory.
@@ -80,11 +79,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 \
-       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 \
-       routers/*.o routers/*.a transports/*.o transports/*.a
+       routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so
 
 distclean:; $(RM_COMMAND) -rf build-*