From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Sat, 11 Jul 2009 22:18:08 +0000 (-0400)
Subject: Parallel make: additional fixes
X-Git-Tag: openafs-devel-1_5_61~131
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=8e382795d52b6fe8db33ff5353f841b077a25671;hp=c8920835ae9e33555a7d023cd0bd3a2f26a98b98

Parallel make: additional fixes

Testing turned up a few more errors with parallel builds:

- Linux: Apply a similar fix for "make dest" to the one in the previous
patch for "make install".  Avoid conflict between DESTDIRS and COMPDIRS,
which also prevents unneeded duplicate work.

- Fix a couple of cases where we have 2 targets in a single rule with a
command that generates both of them.  Two parallel jobs can run this
command at the same time, with missing or corrrupted files as a result.
The workaround: make one of the targets build the files, and make the
second target depend on the other one.

Reviewed-on: http://gerrit.openafs.org/57
Verified-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 306fa47..d148c6b 100644
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -76,7 +76,9 @@ bosint.cs.c: bosint.h
 bosint.ss.c: bosint.h
 bosint.xdr.c: bosint.h
 
-bnode.h boserr.c: bnode.p.h boserr.et
+bnode.h: boserr.c
+
+boserr.c: bnode.p.h boserr.et
 	$(RM) -f boserr.c bnode.h
 	${COMPILE_ET} -p ${srcdir} boserr -h bnode
 
diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index 121d0e4..8f98dc4 100644
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -103,7 +103,9 @@ authclient.o: authclient.c ${INCLS}
 
 kaerrors.o: kaerrors.c
 
-kaerrors.c kautils.h: kaerrors.et kautils.p.h
+kautils.h: kaerrors.c
+
+kaerrors.c: kaerrors.et kautils.p.h
 	$(RM) -f kautils.h kaerrors.c
 	${COMPILE_ET} -p ${srcdir} kaerrors -h kautils
 
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 823928b..e3babb5 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -170,7 +170,9 @@ setup:
 
 ${INSTDIRS}:
 
-${COMPDIRS} ${DESTDIRS}: setup
+${DESTDIRS}:
+
+${COMPDIRS}: setup
 	$(RM) -f h 
 	$(RM) -f sys
 	$(RM) -f netinet