X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/c35e155caf605c139c3e62606ff830744682c8a7..f9850c6c4851862a66f6ce58bb9ac19ddac7895c:/src/Makefile?ds=inline

diff --git a/src/Makefile b/src/Makefile
index c1233fced..4c8300ca7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,8 @@
-# $Cambridge: exim/src/Makefile,v 1.4 2005/09/12 13:55:54 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 - 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 +25,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,23 +52,22 @@ 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.
 
-install:;	@cd build-$(buildname); \
+install:        all
+		@cd build-$(buildname); \
 		build=$(build) $(SHELL) ../scripts/exim_install $(INSTALL_ARG)
 
 # Tidy-up targets
@@ -80,11 +78,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-*