X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/2791749f220602482c2cce772e6520c54218c0dd..81cc39a7f5c17099f93b5c611bde5f58daaab71b:/src/OS/Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 1ab3ac35f..9eed7b0b9 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -6,6 +6,7 @@
 # build directory.
 #
 # Copyright (c) The Exim Maintainers 1995 - 2018
+# Copyright (c) The Exim Maintainers 2020
 
 SHELL      = $(MAKE_SHELL)
 SCRIPTS    = ../scripts
@@ -644,8 +645,7 @@ HDRS  =	blob.h \
 	mytypes.h \
 	sha_ver.h \
 	structs.h \
-	os.h \
-	osfunctions.h
+	os.h
 PHDRS = ../config.h \
 	../dbfunctions.h \
 	../dbstuff.h \
@@ -656,18 +656,20 @@ PHDRS = ../config.h \
 	../macros.h \
 	../mytypes.h \
 	../structs.h \
-	../os.h \
-	../osfunctions.h
+	../os.h
 
 .SUFFIXES: .o .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
 
+version.h: version.sh
+
 cnumber.h: version.h
 
 version.o: $(HDRS) cnumber.h version.h version.c
@@ -872,9 +874,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)
-		 @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.