From 2247672183a05fed9ed58d900b96431a4eddb2a1 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 1 Mar 2014 17:02:43 +0000 Subject: [PATCH] Fix parallel make. Bug 1446 from work by Heiko Schlittermann --- src/OS/Makefile-Base | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index 1500e85ec..f0edbf132 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -106,8 +106,7 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ transport-filter.pl convert4r3 convert4r4 \ exim_checkaccess \ exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \ - buildlookups buildrouters buildtransports \ - buildauths buildpdkim exim + exim # Targets for special-purpose configuration header builders @@ -649,7 +648,8 @@ $(MONBIN): $(HDRS) # The lookups library. -buildlookups lookups/lookups.a: config.h version.h +buildlookups: lookups/lookups.a +lookups/lookups.a: config.h version.h @cd lookups && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" HDRS="../version.h $(PHDRS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \ @@ -658,7 +658,8 @@ buildlookups lookups/lookups.a: config.h version.h # The routers library. -buildrouters routers/routers.a: config.h +buildrouters: routers/routers.a +routers/routers.a: config.h @cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" @@ -666,7 +667,8 @@ buildrouters routers/routers.a: config.h # The transports library. -buildtransports transports/transports.a: config.h +buildtransports: transports/transports.a +transports/transports.a: config.h @cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" @@ -674,7 +676,8 @@ buildtransports transports/transports.a: config.h # The library of authorization modules -buildauths auths/auths.a: config.h +buildauths: auths/auths.a +auths/auths.a: config.h @cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" @@ -682,7 +685,8 @@ buildauths auths/auths.a: config.h # The PDKIM library -buildpdkim pdkim/pdkim.a: config.h +buildpdkim: pdkim/pdkim.a +pdkim/pdkim.a: config.h @cd pdkim && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" -- 2.25.1