dnslists: hardwired return value check. Bug 2631

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

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 36af8308d05333cb6a43623c7a4bbb2a4373c130..77fb3474298a3fa399c0f252395ee6c749785a32 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -6,6 +6,7 @@
 # build directory.
 #
 # Copyright (c) The Exim Maintainers 1995 - 2018
 # build directory.
 #
 # Copyright (c) The Exim Maintainers 1995 - 2018

+# Copyright (c) The Exim Maintainers 2020

 
 SHELL      = $(MAKE_SHELL)
 SCRIPTS    = ../scripts
 
 SHELL      = $(MAKE_SHELL)
 SCRIPTS    = ../scripts


@@ -483,7 +484,7 @@ OBJ_LOOKUPS = lookups/lf_quote.o lookups/lf_check_file.o lookups/lf_sqlperform.o
 
 OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         directory.o dns.o drtables.o enq.o exim.o expand.o filter.o \
 
 OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         directory.o dns.o drtables.o enq.o exim.o expand.o filter.o \

-        filtertest.o globals.o dkim.o dkim_transport.o hash.o \
+        filtertest.o globals.o dkim.o dkim_transport.o dnsbl.o hash.o \

         header.o host.o ip.o log.o lss.o match.o md5.o moan.o \
         os.o parse.o queue.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \
         header.o host.o ip.o log.o lss.o match.o md5.o moan.o \
         os.o parse.o queue.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \


@@ -661,11 +662,14 @@ PHDRS = ../config.h \
 .c.o:;  @echo "$(CC) $*.c"
        $(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $*.c
 
 .c.o:;  @echo "$(CC) $*.c"
        $(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $*.c
 

-# Update Exim's version information and build the version object.
+# Update Exim's version information and build the version object.  The dependency
+# chain here avoids problems under parallel-make.

 
 

-version.h version.sh::
+version.sh:

        @../scripts/reversion
 
        @../scripts/reversion
 

+version.h: version.sh
+

 cnumber.h: version.h
 
 version.o: $(HDRS) cnumber.h version.h version.c
 cnumber.h: version.h
 
 version.o: $(HDRS) cnumber.h version.h version.c


@@ -770,6 +774,7 @@ debug.o:         $(HDRS) debug.c
 deliver.o:       $(HDRS) transports/smtp.h deliver.c
 directory.o:     $(HDRS) directory.c
 dns.o:           $(HDRS) dns.c
 deliver.o:       $(HDRS) transports/smtp.h deliver.c
 directory.o:     $(HDRS) directory.c
 dns.o:           $(HDRS) dns.c

+dnsbl.o:         $(HDRS) dnsbl.c

 enq.o:           $(HDRS) enq.c
 exim.o:          $(HDRS) exim.c
 expand.o:        $(HDRS) expand.c
 enq.o:           $(HDRS) enq.c
 exim.o:          $(HDRS) exim.c
 expand.o:        $(HDRS) expand.c


@@ -870,9 +875,9 @@ em_text.o:       ../exim_monitor/em_text.c    ../exim_monitor/em_hdr.h
 em_xs.o:         ../exim_monitor/em_xs.c      ../exim_monitor/em_hdr.h
 em_version.o:    ../exim_monitor/em_version.c ../exim_monitor/em_hdr.h
 $(MONBIN): $(HDRS)
 em_xs.o:         ../exim_monitor/em_xs.c      ../exim_monitor/em_hdr.h
 em_version.o:    ../exim_monitor/em_version.c ../exim_monitor/em_hdr.h
 $(MONBIN): $(HDRS)

-                @echo "$(CC) exim_monitor/`echo $@ | sed 's/o$$/c/'`"
-                $(FE)$(CC) -o $@ -c $(CFLAGS) -I. -I../exim_monitor $(INCLUDE) $(XINCLUDE) \
-                  ../exim_monitor/`echo $@ | sed 's/o$$/c/'`
+                @echo "$(CC) exim_monitor/$(@:.o=.c)"
+                $(FE)$(CC) -o $@ -c $(CFLAGS) -DCOMPILE_UTILITY -I. -I../exim_monitor $(INCLUDE) $(XINCLUDE) \
+                  ../exim_monitor/$(@:.o=.c)

 
 
 # Targets for the various libraries that Exim uses.
 
 
 # Targets for the various libraries that Exim uses.