libafs: Serialize INSTDIRS/DESTDIRS and COMPDIRS

[openafs.git] / src / libafs / Makefile.common.in

diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in
index a72d394..03e0374 100644 (file)
--- a/src/libafs/Makefile.common.in
+++ b/src/libafs/Makefile.common.in
@@ -52,6 +52,11 @@ system:      all
 install:       all $(INSTDIRS)
 dest:          all $(DESTDIRS)
 
+# Don't let INSTDIRS or DESTDIRS run in parallel with COMPDIRS. They both do
+# some work in sub-makes in the same directory that may conflict with each
+# other (e.g. generating AFS_component_version_number.c).
+$(INSTDIRS) $(DESTDIRS): $(COMPDIRS)
+
 all:   setup $(COMPDIRS)
 
 single_compdir single_instdir single_destdir: setup
@@ -68,7 +73,6 @@ depsrcs:
 
 AFSAOBJS = \
        sha256-kernel.o \
-       rand-fortuna-kernel.o \
        rand-timer-kernel.o \
        afs_atomlist.o \
        afs_lhash.o \
@@ -212,7 +216,6 @@ AFSNONFSOBJS = \
 # init daemons call pioctl
 AFSPAGOBJS = \
        sha256-kernel.o \
-       rand-fortuna-kernel.o \
        rand-timer-kernel.o \
        md5.o           \
        evp.o           \