summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-10-15 22:55:08 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-10-15 22:55:08 +0000
commit153205e33f5afb4965e71c9a5bab7edd7ec215af (patch)
tree8b6b24f8267d31f993df80da9a63b614ae0f2a31
parent1b224bebd4cbe6d294a9ab56a4578d337ea4f611 (diff)
downloadFreeBSD-src-153205e33f5afb4965e71c9a5bab7edd7ec215af.zip
FreeBSD-src-153205e33f5afb4965e71c9a5bab7edd7ec215af.tar.gz
Add more SUBDIR_PARALLEL.
MFC after: 3 weeks Sponsored by: EMC / Isilon Storage Division
-rw-r--r--bin/sh/tests/Makefile2
-rw-r--r--cddl/Makefile5
-rw-r--r--etc/periodic/Makefile1
-rw-r--r--gnu/Makefile5
-rw-r--r--gnu/lib/Makefile3
-rw-r--r--gnu/usr.bin/cc/Makefile12
-rw-r--r--gnu/usr.bin/groff/Makefile2
-rw-r--r--gnu/usr.bin/rcs/Makefile4
-rw-r--r--include/Makefile1
-rw-r--r--lib/libiconv_modules/Makefile1
-rw-r--r--secure/Makefile4
-rw-r--r--secure/libexec/Makefile2
-rw-r--r--secure/usr.bin/Makefile2
-rw-r--r--secure/usr.sbin/Makefile2
-rw-r--r--share/Makefile2
-rw-r--r--share/doc/Makefile2
-rw-r--r--share/doc/legal/Makefile2
-rw-r--r--share/doc/papers/Makefile2
-rw-r--r--share/doc/psd/Makefile2
-rw-r--r--share/doc/smm/Makefile2
-rw-r--r--share/doc/usd/Makefile1
-rw-r--r--share/examples/Makefile2
-rw-r--r--share/i18n/Makefile1
-rw-r--r--share/i18n/csmapper/Makefile1
-rw-r--r--share/i18n/esdb/Makefile1
-rw-r--r--share/man/Makefile1
-rw-r--r--share/syscons/Makefile1
-rw-r--r--tests/Makefile1
-rw-r--r--tests/sys/Makefile2
-rw-r--r--tests/sys/pjdfstest/Makefile1
-rw-r--r--tests/sys/pjdfstest/tests/Makefile2
31 files changed, 67 insertions, 5 deletions
diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile
index d93e19a..a9abc80 100644
--- a/bin/sh/tests/Makefile
+++ b/bin/sh/tests/Makefile
@@ -10,4 +10,6 @@ TESTS_SUBDIRS+= parameters
TESTS_SUBDIRS+= parser
TESTS_SUBDIRS+= set-e
+SUBDIR_PARALLEL=
+
.include <bsd.test.mk>
diff --git a/cddl/Makefile b/cddl/Makefile
index 44b778d..26b502a 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -2,10 +2,13 @@
.include <src.opts.mk>
-SUBDIR= lib sbin usr.bin usr.sbin
+SUBDIR= lib .WAIT \
+ sbin usr.bin usr.sbin
.if ${MK_TESTS} != "no"
SUBDIR+=tests
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile
index 8fb56df..a2d9902 100644
--- a/etc/periodic/Makefile
+++ b/etc/periodic/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
SUBDIR= daily security weekly monthly
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/gnu/Makefile b/gnu/Makefile
index 25480c7..bd84bc4 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -3,10 +3,13 @@
.include <src.opts.mk>
-SUBDIR= lib ${_tests} usr.bin
+SUBDIR= lib .WAIT \
+ ${_tests} usr.bin
.if ${MK_TESTS} != "no"
_tests= tests
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 4fff36a..b77f9e3 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -24,6 +24,9 @@ SUBDIR+= libreadline
# have taken care of that already.
.if ${MK_GNUCXX} != "no"
SUBDIR+= libstdc++ libsupc++
+SUBDIR_DEPENDS_libsupc++:= libstdc++
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 41349cf..378abab 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -5,7 +5,8 @@
# The order of some of these are rather important. Some depend on previous
# subdirs.
-SUBDIR= cc_tools libiberty libcpp libdecnumber cc_int cc cc1 include
+SUBDIR= cc_tools .WAIT \
+ libiberty libcpp libdecnumber cc_int cc cc1 include
.if ${MK_CPP} != "no"
SUBDIR+= cpp
@@ -19,4 +20,13 @@ SUBDIR+= cc1plus c++
SUBDIR+= gcov
.endif
+SUBDIR_DEPEND_c++:= libcpp libiberty
+SUBDIR_DEPEND_cc= libcpp libiberty
+SUBDIR_DEPEND_cpp= libcpp libiberty
+SUBDIR_DEPEND_cc1plus= cc_int libcpp libdecnumber libiberty
+SUBDIR_DEPEND_cc1= cc_int libcpp libdecnumber libiberty
+SUBDIR_DEPEND_gcov= libiberty
+
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index cb83dea..ba76025 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -6,4 +6,6 @@ SUBDIR= contrib font man src tmac
SUBDIR_DEPEND_${subdir}= src
.endfor
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/rcs/Makefile b/gnu/usr.bin/rcs/Makefile
index d6a960b..6b2bd1c 100644
--- a/gnu/usr.bin/rcs/Makefile
+++ b/gnu/usr.bin/rcs/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
-SUBDIR= lib ci co merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
+SUBDIR= lib .WAIT \
+ ci co merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/include/Makefile b/include/Makefile
index 1cecff7..eed1c92 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -7,6 +7,7 @@
CLEANFILES= osreldate.h version vers.c
SUBDIR= arpa protocols rpcsvc rpc xlocale
+SUBDIR_PARALLEL=
INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
db.h \
dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
diff --git a/lib/libiconv_modules/Makefile b/lib/libiconv_modules/Makefile
index 1a72136..3af91c7 100644
--- a/lib/libiconv_modules/Makefile
+++ b/lib/libiconv_modules/Makefile
@@ -5,5 +5,6 @@
SUBDIR= BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \
UTF7 UTF8 VIQR ZW iconv_none iconv_std mapper_646 mapper_none \
mapper_parallel mapper_serial mapper_std mapper_zone
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/secure/Makefile b/secure/Makefile
index 1277853..0b8ec01 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -2,7 +2,9 @@
.include <src.opts.mk>
-SUBDIR= lib libexec ${_tests} usr.bin usr.sbin
+SUBDIR= lib .WAIT \
+ libexec ${_tests} usr.bin usr.sbin
+SUBDIR_PARALLEL=
.if ${MK_TESTS} != "no"
_tests= tests
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 07aa3dd..2e2eaf9 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -11,4 +11,6 @@ SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
SUBDIR+=tests
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index e14ebe3..f85fced 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -14,4 +14,6 @@ SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
SUBDIR+=tests
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile
index e42f456..9b2f910 100644
--- a/secure/usr.sbin/Makefile
+++ b/secure/usr.sbin/Makefile
@@ -11,4 +11,6 @@ SUBDIR+=sshd
SUBDIR+=tests
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/share/Makefile b/share/Makefile
index 97d1dac..216ad1e 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -98,4 +98,6 @@ _vt= vt
_zoneinfo= zoneinfo
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/share/doc/Makefile b/share/doc/Makefile
index c752c51..7a02b29 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -28,6 +28,8 @@ _IPv6= IPv6
_roffdocs= papers psd smm usd
.endif
+SUBDIR_PARALLEL=
+
# Default output format for troff documents is ascii.
# To generate postscript versions of troff documents, use:
# make PRINTERDEVICE=ps
diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile
index 9590800..345eafc 100644
--- a/share/doc/legal/Makefile
+++ b/share/doc/legal/Makefile
@@ -6,4 +6,6 @@ SUBDIR= intel_ipw \
intel_wpi \
realtek
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index eaf097f..ddf1323 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -15,4 +15,6 @@ SUBDIR= beyond4.3 \
sysperf \
timecounter
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 243ba99..6b6d9cd 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -37,4 +37,6 @@ SUBDIR+=22.rpcgen \
26.rpcrfc \
27.nfsrpc
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index 1d99b05..c6c9c51 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -32,4 +32,6 @@ _08.sendmailop= 08.sendmailop
_07.lpd= 07.lpd
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index 5fcb6b3..8638158 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -19,5 +19,6 @@ SUBDIR= title \
20.meref \
21.troff \
22.trofftut
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index f20ea7f..63ad5b3 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -261,4 +261,6 @@ SUBDIR+=pf
SUBDIR+=tests
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
diff --git a/share/i18n/Makefile b/share/i18n/Makefile
index 1cadd54..b166d94 100644
--- a/share/i18n/Makefile
+++ b/share/i18n/Makefile
@@ -4,5 +4,6 @@
.include <bsd.own.mk>
SUBDIR= csmapper esdb
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/share/i18n/csmapper/Makefile b/share/i18n/csmapper/Makefile
index 7bca3ab..18ee8fc 100644
--- a/share/i18n/csmapper/Makefile
+++ b/share/i18n/csmapper/Makefile
@@ -5,6 +5,7 @@ FILESDIR= ${CSMAPPERDIR}
SUBDIR= APPLE AST BIG5 CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 JIS \
KAZAKH KOI KS MISC TCVN
+SUBDIR_PARALLEL=
mapper.dir: ${SUBDIR}
newfile=$$(for i in ${SUBDIR}; do \
diff --git a/share/i18n/esdb/Makefile b/share/i18n/esdb/Makefile
index 2b16d90..69d4445 100644
--- a/share/i18n/esdb/Makefile
+++ b/share/i18n/esdb/Makefile
@@ -5,6 +5,7 @@ FILESDIR= ${ESDBDIR}
SUBDIR= APPLE AST BIG5 CP DEC EUC EBCDIC GB GEORGIAN ISO-2022 ISO-8859 \
ISO646 KAZAKH KOI MISC TCVN UTF
+SUBDIR_PARALLEL=
FILES+= esdb.dir esdb.dir.db esdb.alias esdb.alias.db
CLEANFILES= ${FILES}
diff --git a/share/man/Makefile b/share/man/Makefile
index c3bd5f2..e1dc9cf 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -5,6 +5,7 @@
# XXX MISSING: man3f
SUBDIR= man1 man3 man4 man5 man6 man7 man8 man9
+SUBDIR_PARALLEL=
MAKEWHATIS?= makewhatis
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 9cbf100..c5993a8 100644
--- a/share/syscons/Makefile
+++ b/share/syscons/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
SUBDIR= fonts keymaps scrnmaps
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/tests/Makefile b/tests/Makefile
index 7fdc5d7..8b3ccb1 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,6 +4,7 @@
SUBDIR+= etc
SUBDIR+= sys
+SUBDIR_PARALLEL=
TESTSDIR= ${TESTSBASE}
KYUAFILE= yes
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 0f20aa6..41eb34d 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -18,4 +18,6 @@ TESTS_SUBDIRS+= vm
# Items not integrated into kyua runs by default
SUBDIR+= pjdfstest
+SUBDIR_PARALLEL=
+
.include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/Makefile b/tests/sys/pjdfstest/Makefile
index 7047811..a398d39 100644
--- a/tests/sys/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/Makefile
@@ -2,5 +2,6 @@
SUBDIR+= pjdfstest
SUBDIR+= tests
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile
index 95b4bbe..61b15dd 100644
--- a/tests/sys/pjdfstest/tests/Makefile
+++ b/tests/sys/pjdfstest/tests/Makefile
@@ -36,4 +36,6 @@ TESTS_SUBDIRS+= symlink
TESTS_SUBDIRS+= truncate
TESTS_SUBDIRS+= unlink
+SUBDIR_PARALLEL=
+
.include <bsd.test.mk>
OpenPOWER on IntegriCloud