X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2FOS%2FMakefile-Base;h=9eed7b0b9fae1f24bedc1aa0d48de98e6fdb61c7;hp=9ecde1d3e71737868ddc57d2658dbfac2116abdc;hb=302e7912253bd1f1a88f04d9a8a71d8a3c9b93fc;hpb=b30930a554edd087932dbff2d4d32f340de28ed1

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 9ecde1d3e..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
@@ -79,23 +80,8 @@ Makefile: ../OS/Makefile-Base ../OS/Makefile-Default \
 
 # Build (link) the os.h file
 
-#os.h:	$(SCRIPTS)/Configure-os.h \
-#	$(O)/os.h-AIX		$(O)/os.h-BSDI	$(O)/os.h-cygwin \
-#	$(O)/os.h-Darwin	$(O)/os.h-DGUX	$(O)/os.h-DragonFly \
-#	$(O)/os.h-FreeBSD	$(O)/os.h-GNU	$(O)/os.h-GNUkFreeBSD \
-#	$(O)/os.h-GNUkNetBSD	$(O)/os.h-HI-OSF \
-#	$(O)/os.h-HI-UX		$(O)/os.h-HP-UX	$(O)/os.h-HP-UX-9 \
-#	$(O)/os.h-IRIX		$(O)/os.h-IRIX6	$(O)/os.h-IRIX632 \
-#	$(O)/os.h-IRIX65	$(O)/os.h-Linux	$(O)/os.h-mips \
-#	$(O)/os.h-NetBSD	$(O)/os.h-NetBSD-a.out \
-#	$(O)/os.h-OpenBSD	$(O)/os.h-OpenUNIX	$(O)/os.h-OSF1 \
-#	$(O)/os.h-QNX		$(O)/os.h-SCO		$(O)/os.h-SCO_SV \
-#	$(O)/os.h-SunOS4	$(O)/os.h-SunOS5	$(O)/os.h-SunOS5-hal \
-#	$(O)/os.h-ULTRIX	$(O)/os.h-UNIX_SV \
-#	$(O)/os.h-Unixware7	$(O)/os.h-USG
-#	$(SHELL) $(SCRIPTS)/Configure-os.h
-
 os.h:	$(SCRIPTS)/Configure-os.h \
+	$(O)/os.h-Darwin	\
 	$(O)/os.h-FreeBSD	\
 	$(O)/os.h-GNU		\
 	$(O)/os.h-Linux		\
@@ -105,17 +91,12 @@ os.h:	$(SCRIPTS)/Configure-os.h \
 
 # Build the os.c file
 
-#os.c:   ../src/os.c \
-#	$(SCRIPTS)/Configure-os.c \
-#	$(O)/os.c-cygwin	$(O)/os.c-GNU	$(O)/os.c-HI-OSF \
-#	$(O)/os.c-IRIX		$(O)/os.c-IRIX6	$(O)/os.c-IRIX632 \
-#	$(O)/os.c-IRIX65	$(O)/os.c-Linux	$(O)/os.c-OSF1
-#	$(SHELL) $(SCRIPTS)/Configure-os.c
-
 os.c:   ../src/os.c \
 	$(SCRIPTS)/Configure-os.c \
+	$(O)/os.c-FreeBSD	\
 	$(O)/os.c-GNU		\
-	$(O)/os.c-Linux
+	$(O)/os.c-Linux		\
+	$(O)/os.c-SunOS5
 	$(SHELL) $(SCRIPTS)/Configure-os.c
 
 # Build the config.h file.
@@ -681,11 +662,14 @@ PHDRS = ../config.h \
 .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
@@ -890,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.