diff options
31 files changed, 69 insertions, 5 deletions
diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile index c092962..d10156c 100644 --- a/bin/sh/tests/Makefile +++ b/bin/sh/tests/Makefile @@ -12,4 +12,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 2a9b6f8..c134b63 100644 --- a/cddl/Makefile +++ b/cddl/Makefile @@ -2,10 +2,13 @@ .include <bsd.own.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 b460590..4eb1745 100644 --- a/gnu/Makefile +++ b/gnu/Makefile @@ -3,10 +3,13 @@ .include <bsd.own.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 70e6811..4a07370 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -16,6 +16,9 @@ SUBDIR+= tests # 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 bf6d20c..ee0f22b 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 doc +SUBDIR= cc_tools .WAIT \ + libiberty libcpp libdecnumber cc_int cc cc1 include doc .if ${MK_CPP} != "no" SUBDIR+= cpp @@ -24,4 +25,13 @@ SUBDIR+= c++filt 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 2db554f..9733e19 100644 --- a/gnu/usr.bin/groff/Makefile +++ b/gnu/usr.bin/groff/Makefile @@ -6,4 +6,6 @@ SUBDIR= contrib doc 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 4a9fd08..8b04270 100644 --- a/gnu/usr.bin/rcs/Makefile +++ b/gnu/usr.bin/rcs/Makefile @@ -1,3 +1,7 @@ -SUBDIR= lib ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze +# $FreeBSD$ + +SUBDIR= lib .WAIT \ + ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze +SUBDIR_PARALLEL= .include <bsd.subdir.mk> diff --git a/include/Makefile b/include/Makefile index 09b4080..1c2bf39 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 db5a32e..0794db6 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -2,7 +2,9 @@ .include <bsd.own.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 9edc8e6..484bad8 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 e819ba7..8de53e2 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 33d945c..37d8282 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 72b1b2e..078ee1d 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 d01a2b2..a8726bb 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 866fe20..c126345 100644 --- a/share/doc/papers/Makefile +++ b/share/doc/papers/Makefile @@ -16,4 +16,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 fd42bd4..fd7a23f 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 9d71e7a..ad4c40e 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 524235c..d2638be 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 5e42575..feef2c7 100644 --- a/tests/sys/Makefile +++ b/tests/sys/Makefile @@ -19,4 +19,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 248b209..917b01a 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> |
