Additional fixes for parallel make

Add some additional dependencies to constrain the build order to prevent
parallel make from failing.  In the case of src/Makefile, this is likely to be
too complicated to be worth maintaining, so just add .NOTPARALLEL to get the
old for-loop-like behavior.

More fine-tuning might be necessary for some platforms or configurations.

diff --git a/src/Makefile b/src/Makefile
index 0d4a6ee65b9e45a2d643250649b86674347d7f7b..4469d2cdf2c004e178d9b9d3c268e913224c4a93 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,6 +26,10 @@ SUBDIRS = \
        makefiles \
        test/regress
 
+# There are too many interdependencies between the subdirectories, so
+# don't attempt parallel make here.
+.NOTPARALLEL:
+
 $(recurse)
 
 install: install-local

diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index 2c034bc79238868bbc18266de5865c8a57ff4380..9fe368eed50a8ee022118c338e365434d6737d8c 100644 (file)
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -15,3 +15,5 @@ include $(top_builddir)/src/Makefile.global
 SUBDIRS = libpq ecpg
 
 $(recurse)
+
+all-ecpg-recurse: all-libpq-recurse

diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
index d955ceed1c99a3d8d0aeaf6b68d07924bff7530b..ca434c8ce22e56bd2214453a4d498ae3b3099844 100644 (file)
--- a/src/interfaces/ecpg/Makefile
+++ b/src/interfaces/ecpg/Makefile
@@ -6,7 +6,8 @@ SUBDIRS = include pgtypeslib ecpglib compatlib preproc
 
 $(recurse)
 
-all-compatlib-recursive: all-ecpglib-recursive
+all-compatlib-recurse: all-ecpglib-recurse
+all-ecpglib-recurse: all-pgtypeslib-recurse
 
 clean distclean maintainer-clean:
        $(MAKE) -C test clean