Fix backwards compatibility bug in named ACL variables.

[users/jgh/exim.git] / src / OS / Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index ddfe23ae4c91c6f6841723c30564b10426efecbc..698a2b20792dd4d9282fca1a3b3305b6aed00665 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-Base,v 1.7 2005/06/27 10:24:43 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-Base,v 1.10 2006/02/07 14:20:58 ph10 Exp $
 
 # This file is the basis of the main makefile for Exim and friends. The
 # makefile at the top level arranges to build the main makefile by calling
@@ -655,7 +655,7 @@ $(MONBIN): $(HDRS)
 buildpcre:
         @(cd pcre; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" \
           FE="$(FE)" CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" \
-          RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+          RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)")
         @if $(SHELL) $(SCRIPTS)/newer pcre/libpcre.a exim; then \
           rm -f exim eximon.bin; fi
@@ -665,7 +665,7 @@ buildpcre:
 
 buildlookups:
         @cd lookups; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
-          FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+          FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"; \
         echo " "
 
@@ -673,7 +673,7 @@ buildlookups:
 
 buildrouters:
         @cd routers; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
-          FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+          FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
         echo " "
 
@@ -681,7 +681,7 @@ buildrouters:
 
 buildtransports:
         @cd transports; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
-          FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+          FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
         echo " "
 
@@ -689,7 +689,7 @@ buildtransports:
 
 buildauths:
         @cd auths; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
-          FE="$(FE)" RANLIB="$(RANLIB)" HDRS="$(PHDRS)" \
+          FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
           INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \
         echo " "
 
@@ -727,15 +727,16 @@ test_dbfn:   config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \
          tod.o version.o $(LIBS) $(DBMLIB)
        rm -f dbfn.o
 
-test_host:   config.h host.c dns.c dummies.o sa-globals.o sa-os.o store.o \
-              string.o tod.o tree.o
+test_host:   config.h child.c host.c dns.c dummies.c sa-globals.o os.o \
+              store.o string.o tod.o tree.o
+       $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST child.c
        $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c
        $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c
        $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c
        $(LNCC) -o test_host $(LFLAGS) \
-         host.o dns.o dummies.o sa-globals.o os.o store.o string.o tod.o tree.o \
-         $(LIBS) $(LIBRESOLV)
-       rm -f dummies.o  host.o dns.o
+         host.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \
+         tod.o tree.o $(LIBS) $(LIBRESOLV)
+       rm -f child.o dummies.o host.o dns.o
 
 test_os:     os.h os.c dummies.o sa-globals.o store.o string.o tod.o
        $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE os.c