Index: head/bin/sh/tests/Makefile =================================================================== --- head/bin/sh/tests/Makefile (revision 289392) +++ head/bin/sh/tests/Makefile (revision 289393) @@ -1,13 +1,15 @@ # $FreeBSD$ .include TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution TESTS_SUBDIRS+= expansion TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e +SUBDIR_PARALLEL= + .include Index: head/cddl/Makefile =================================================================== --- head/cddl/Makefile (revision 289392) +++ head/cddl/Makefile (revision 289393) @@ -1,11 +1,14 @@ # $FreeBSD$ .include -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 Index: head/etc/periodic/Makefile =================================================================== --- head/etc/periodic/Makefile (revision 289392) +++ head/etc/periodic/Makefile (revision 289393) @@ -1,5 +1,6 @@ # $FreeBSD$ SUBDIR= daily security weekly monthly +SUBDIR_PARALLEL= .include Index: head/gnu/Makefile =================================================================== --- head/gnu/Makefile (revision 289392) +++ head/gnu/Makefile (revision 289393) @@ -1,12 +1,15 @@ # @(#)Makefile 5.33.1.1 (Berkeley) 5/6/91 # $FreeBSD$ .include -SUBDIR= lib ${_tests} usr.bin +SUBDIR= lib .WAIT \ + ${_tests} usr.bin .if ${MK_TESTS} != "no" _tests= tests .endif + +SUBDIR_PARALLEL= .include Index: head/gnu/lib/Makefile =================================================================== --- head/gnu/lib/Makefile (revision 289392) +++ head/gnu/lib/Makefile (revision 289393) @@ -1,29 +1,32 @@ # $FreeBSD$ .include SUBDIR= csu libgcc libdialog libregex .if ${MK_GCC} != "no" SUBDIR+= libgcov libgomp .endif .if ${MK_SSP} != "no" SUBDIR+= libssp .endif .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no" SUBDIR+= libreadline .endif # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. .if ${MK_GNUCXX} != "no" SUBDIR+= libstdc++ libsupc++ +SUBDIR_DEPENDS_libsupc++:= libstdc++ .endif + +SUBDIR_PARALLEL= .include Index: head/gnu/usr.bin/cc/Makefile =================================================================== --- head/gnu/usr.bin/cc/Makefile (revision 289392) +++ head/gnu/usr.bin/cc/Makefile (revision 289393) @@ -1,22 +1,32 @@ # $FreeBSD$ .include # 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 .endif .if ${MK_CXX} != "no" SUBDIR+= cc1plus c++ .endif .if ${MK_GCOV} != "no" 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 Index: head/gnu/usr.bin/groff/Makefile =================================================================== --- head/gnu/usr.bin/groff/Makefile (revision 289392) +++ head/gnu/usr.bin/groff/Makefile (revision 289393) @@ -1,9 +1,11 @@ # $FreeBSD$ SUBDIR= contrib font man src tmac .for subdir in ${SUBDIR:Nsrc} SUBDIR_DEPEND_${subdir}= src .endfor +SUBDIR_PARALLEL= + .include Index: head/gnu/usr.bin/rcs/Makefile =================================================================== --- head/gnu/usr.bin/rcs/Makefile (revision 289392) +++ head/gnu/usr.bin/rcs/Makefile (revision 289393) @@ -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 Index: head/include/Makefile =================================================================== --- head/include/Makefile (revision 289392) +++ head/include/Makefile (revision 289393) @@ -1,385 +1,386 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 # $FreeBSD$ # # Doing a "make install" builds /usr/include. .include 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 \ fts.h ftw.h getopt.h glob.h grp.h \ ieeefp.h ifaddrs.h \ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \ ndbm.h netconfig.h \ netdb.h nl_types.h nlist.h nss.h nsswitch.h paths.h \ printf.h proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h \ res_update.h resolv.h runetype.h search.h semaphore.h setjmp.h \ signal.h spawn.h stab.h stdalign.h stdbool.h stddef.h \ stdnoreturn.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ uchar.h ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h \ wchar.h wctype.h wordexp.h xlocale.h .PATH: ${.CURDIR}/../contrib/libc-vis INCS+= vis.h MHDRS= float.h floatingpoint.h stdarg.h PHDRS= sched.h _semaphore.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \ syslog.h ucontext.h LDIRS= bsm cam geom net net80211 netgraph netinet netinet6 \ netipsec netnatm netsmb nfs nfsclient nfsserver sys vm LSUBDIRS= cam/ata cam/scsi \ dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \ dev/hwpmc \ dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ net/altq \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs LSUBSUBDIRS= dev/mpt/mpilib .if ${MK_BLUETOOTH} != "no" LSUBSUBDIRS+= netgraph/bluetooth/include .endif .if ${MK_CUSE} != "no" LSUBDIRS+= fs/cuse .endif .if ${MK_GSSAPI} != "no" SUBDIR+= gssapi INCS+= gssapi.h .endif .if ${MK_HESIOD} != "no" INCS+= hesiod.h .endif # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" INCS+= iconv.h .endif .if ${MK_USB} != "no" LSUBDIRS+= dev/usb .endif .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" _dev_powermac_nvram= dev/powermac_nvram .endif # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is # probably only useful for developers and should be avoided if you do not # wish to tie your /usr/include and /usr/src together. #SHARED= symlinks SHARED?= copies INCS+= osreldate.h SYSDIR= ${.CURDIR}/../sys NEWVERS_SH= ${SYSDIR}/conf/newvers.sh PARAM_H= ${SYSDIR}/sys/param.h MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH} env ECHO="${ECHO}" \ MAKE="${MAKE}" \ NEWVERS_SH=${NEWVERS_SH} \ PARAM_H=${PARAM_H} \ SYSDIR=${SYSDIR} \ sh ${MK_OSRELDATE_SH} .for i in ${LHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i .endfor .for i in ${MHDRS} INCSLINKS+= machine/$i ${INCLUDEDIR}/$i .endfor .for i in ${PHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i .endfor .if ${MACHINE} != ${MACHINE_CPUARCH} _MARCHS= ${MACHINE_CPUARCH} .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _MARCHS+= x86 .endif .if ${MK_STAGING} == "yes" # tell bsd.incs.mk that we have it covered NO_STAGE_INCLUDES= .endif .include .if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD) .if make(all) DESTDIR= ${STAGE_OBJTOP} all: stage_include installincludes: buildincludes buildincludes: stage_prep stage_prep: @mkdir -p ${DESTDIR}${INCLUDEDIR} @touch $@ stage_include: .dirdep installincludes @touch $@ .endif .endif installincludes: ${SHARED} ${SHARED}: compat # Take care of stale directory-level symlinks. compat: .for i in ${LDIRS} ${LSUBDIRS} machine ${_MARCHS} crypto if [ -L ${DESTDIR}${INCLUDEDIR}/$i ]; then \ rm -f ${DESTDIR}${INCLUDEDIR}/$i; \ fi .endfor mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f ${.CURDIR}/../etc/mtree/BSD.include.dist \ -p ${DESTDIR}${INCLUDEDIR} > /dev/null .if ${MK_META_MODE} == "yes" @touch ${.TARGET} .endif copies: .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \ ${_MARCHS} if [ -d ${DESTDIR}${INCLUDEDIR}/$i ]; then \ cd ${DESTDIR}${INCLUDEDIR}/$i; \ for h in *.h; do \ if [ -L $$h ]; then rm -f $$h; fi; \ done; \ fi .endfor .for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/pci} ${LSUBSUBDIRS} cd ${.CURDIR}/../sys; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${DESTDIR}${INCLUDEDIR}/$i .endfor cd ${.CURDIR}/../sys/dev/acpica; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 acpiio.h \ ${DESTDIR}${INCLUDEDIR}/dev/acpica; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 acpi_hpet.h \ ${DESTDIR}${INCLUDEDIR}/dev/acpica cd ${.CURDIR}/../sys/dev/agp; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 agpreg.h \ ${DESTDIR}${INCLUDEDIR}/dev/agp cd ${.CURDIR}/../sys/dev/bktr; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \ ${DESTDIR}${INCLUDEDIR}/dev/bktr .if ${MK_NAND} != "no" cd ${.CURDIR}/../sys/dev/nand; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 nandsim.h \ ${DESTDIR}${INCLUDEDIR}/dev/nand; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 nand_dev.h \ ${DESTDIR}${INCLUDEDIR}/dev/nand .endif cd ${.CURDIR}/../sys/dev/pci; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \ ${DESTDIR}${INCLUDEDIR}/dev/pci cd ${.CURDIR}/../sys/fs/cd9660/; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/netinet .endif .if ${MK_PF} != "no" cd ${.CURDIR}/../sys/netpfil/pf; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/netpfil/pf .endif cd ${.CURDIR}/../sys/crypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \ ${DESTDIR}${INCLUDEDIR}/crypto cd ${.CURDIR}/../sys/opencrypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/crypto cd ${.CURDIR}/../sys/${MACHINE}/include; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/machine .if exists(${.CURDIR}/../sys/${MACHINE}/include/pc) cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/machine/pc .endif .for _MARCH in ${_MARCHS} .if exists(${.CURDIR}/../sys/${_MARCH}/include) ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ cd ${.CURDIR}/../sys/${_MARCH}/include; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH} .if exists(${.CURDIR}/../sys/${_MARCH}/include/pc) ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc .endif .endif .endfor cd ${.CURDIR}/../sys/rpc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 types.h \ ${DESTDIR}${INCLUDEDIR}/rpc cd ${.CURDIR}/../sys/teken; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \ ${DESTDIR}${INCLUDEDIR}/teken .if ${MK_META_MODE} == "yes" @touch ${.OBJDIR}/${.TARGET} .endif symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." .for i in ${LDIRS} cd ${.CURDIR}/../sys/$i; \ for h in *.h; do \ ln -fs ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor .for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/pci} cd ${.CURDIR}/../sys/$i; \ for h in *.h; do \ ln -fs ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor cd ${.CURDIR}/../sys/dev/acpica; \ for h in acpiio.h acpi_hpet.h; do \ ln -fs ../../../../sys/dev/acpica/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/acpica; \ done cd ${.CURDIR}/../sys/dev/agp; \ for h in agpreg.h; do \ ln -fs ../../../../sys/dev/agp/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/agp; \ done cd ${.CURDIR}/../sys/dev/bktr; \ for h in ioctl_*.h; do \ ln -fs ../../../../sys/dev/bktr/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/bktr; \ done .if ${MK_NAND} != "no" cd ${.CURDIR}/../sys/dev/nand; \ for h in nandsim.h nand_dev.h; do \ ln -fs ../../../../sys/dev/nand/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/nand; \ done .endif cd ${.CURDIR}/../sys/dev/pci; \ for h in pcireg.h; do \ ln -fs ../../../../sys/dev/pci/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/pci; \ done .for i in ${LSUBSUBDIRS} cd ${.CURDIR}/../sys/$i; \ for h in *.h; do \ ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ for h in *.h; do \ ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \ ${DESTDIR}${INCLUDEDIR}/netinet; \ done .endif .if ${MK_PF} != "no" cd ${.CURDIR}/../sys/netpfil/pf; \ for h in *.h; do \ ln -fs ../../../../sys/netpfil/pf/$$h \ ${DESTDIR}${INCLUDEDIR}/netpfil/pf; \ done .endif cd ${.CURDIR}/../sys/crypto; \ for h in rijndael/rijndael.h; do \ ln -fs ../../../sys/crypto/$$h \ ${DESTDIR}${INCLUDEDIR}/crypto; \ done cd ${.CURDIR}/../sys/opencrypto; \ for h in *.h; do \ ln -fs ../../../sys/opencrypto/$$h \ ${DESTDIR}${INCLUDEDIR}/crypto; \ done cd ${.CURDIR}/../sys/${MACHINE}/include; \ for h in *.h; do \ ln -fs ../../../sys/${MACHINE}/include/$$h \ ${DESTDIR}${INCLUDEDIR}/machine; \ done .if exists(${.CURDIR}/../sys/${MACHINE}/include/pc) cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \ for h in *.h; do \ ln -fs ../../../../sys/${MACHINE}/include/pc/$$h \ ${DESTDIR}${INCLUDEDIR}/machine/pc; \ done .endif .for _MARCH in ${_MARCHS} .if exists(${.CURDIR}/../sys/${_MARCH}/include) ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ cd ${.CURDIR}/../sys/${_MARCH}/include; \ for h in *.h; do \ ln -fs ../../../sys/${_MARCH}/include/$$h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ done .if exists(${.CURDIR}/../sys/${_MARCH}/include/pc) ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \ for h in *.h; do \ ln -fs ../../../../sys/${_MARCH}/include/pc/$$h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ done .endif .endif .endfor cd ${.CURDIR}/../sys/fs/cd9660; \ for h in *.h; do \ ln -fs ../../../../sys/fs/cd9660/$$h \ ${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \ done cd ${.CURDIR}/../sys/rpc; \ for h in types.h; do \ ln -fs ../../../sys/rpc/$$h \ ${DESTDIR}${INCLUDEDIR}/rpc; \ done .if ${MK_META_MODE} == "yes" @touch ${.OBJDIR}/${.TARGET} .endif .if ${MACHINE} == "host" # we're here because we are building a sysroot... # we need MACHINE et al set correctly HOST_MACHINE!= uname -m HOST_MACHINE_ARCH!= uname -p MACHINE:= ${HOST_MACHINE} MACHINE_ARCH:= ${HOST_MACHINE_ARCH} .endif Index: head/lib/libiconv_modules/Makefile =================================================================== --- head/lib/libiconv_modules/Makefile (revision 289392) +++ head/lib/libiconv_modules/Makefile (revision 289393) @@ -1,9 +1,10 @@ # $FreeBSD$ .include 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 Index: head/secure/Makefile =================================================================== --- head/secure/Makefile (revision 289392) +++ head/secure/Makefile (revision 289393) @@ -1,41 +1,43 @@ # $FreeBSD$ .include -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 .endif # These are the programs which depend on crypto, but not Kerberos. SPROGS= lib/libfetch lib/libpam lib/libradius lib/libtelnet \ bin/ed libexec/telnetd usr.bin/fetch usr.bin/telnet \ usr.sbin/pkg_install usr.sbin/ppp usr.sbin/tcpdump/tcpdump .if ${MK_SENDMAIL} != "no" SPROGS+=usr.sbin/sendmail .endif # This target is used to rebuild these programs with crypto. secure: .MAKE .PHONY .for entry in ${SPROGS} cd ${.CURDIR}/../${entry}; \ ${MAKE} cleandir; \ ${MAKE} obj; \ ${MAKE} depend; \ ${MAKE} all; \ ${MAKE} install .endfor # This target is used to rebuild these programs without crypto. insecure: .MAKE .PHONY .for entry in ${SPROGS} cd ${.CURDIR}/../${entry}; \ ${MAKE} MK_CRYPT=no cleandir; \ ${MAKE} MK_CRYPT=no obj; \ ${MAKE} MK_CRYPT=no depend; \ ${MAKE} MK_CRYPT=no all; \ ${MAKE} MK_CRYPT=no install .endfor .include Index: head/secure/libexec/Makefile =================================================================== --- head/secure/libexec/Makefile (revision 289392) +++ head/secure/libexec/Makefile (revision 289393) @@ -1,14 +1,16 @@ # $FreeBSD$ .include SUBDIR= .if ${MK_OPENSSH} != "no" SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper .endif .if ${MK_TESTS} != "no" SUBDIR+=tests .endif +SUBDIR_PARALLEL= + .include Index: head/secure/usr.bin/Makefile =================================================================== --- head/secure/usr.bin/Makefile (revision 289392) +++ head/secure/usr.bin/Makefile (revision 289393) @@ -1,17 +1,19 @@ # $FreeBSD$ .include SUBDIR= .if ${MK_OPENSSL} != "no" SUBDIR+=bdes openssl .if ${MK_OPENSSH} != "no" SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan .endif .endif .if ${MK_TESTS} != "no" SUBDIR+=tests .endif +SUBDIR_PARALLEL= + .include Index: head/secure/usr.sbin/Makefile =================================================================== --- head/secure/usr.sbin/Makefile (revision 289392) +++ head/secure/usr.sbin/Makefile (revision 289393) @@ -1,14 +1,16 @@ # $FreeBSD$ .include SUBDIR= .if ${MK_OPENSSH} != "no" SUBDIR+=sshd .endif .if ${MK_TESTS} != "no" SUBDIR+=tests .endif +SUBDIR_PARALLEL= + .include Index: head/share/Makefile =================================================================== --- head/share/Makefile (revision 289392) +++ head/share/Makefile (revision 289393) @@ -1,101 +1,103 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ .include # Do not include `info' in the SUBDIR list, it is handled separately. SUBDIR= ${_colldef} \ ${_dict} \ ${_doc} \ ${_dtrace} \ ${_examples} \ ${_i18n} \ keys \ ${_man} \ ${_me} \ misc \ ${_mk} \ ${_mklocale} \ ${_monetdef} \ ${_msgdef} \ ${_numericdef} \ ${_sendmail} \ skel \ ${_snmp} \ ${_syscons} \ tabset \ termcap \ ${_tests} \ ${_timedef} \ ${_vt} \ ${_zoneinfo} # NB: keep these sorted by MK_* knobs .if ${MK_BSNMP} != "no" _snmp= snmp .endif .if ${MK_CDDL} != "no" _dtrace= dtrace .endif .if ${MK_DICT} != "no" _dict= dict .endif .if ${MK_EXAMPLES} != "no" _examples= examples .endif .if ${MK_GROFF} != "no" _me= me .endif .if ${MK_ICONV} != "no" _i18n= i18n .endif .if ${MK_LOCALES} != "no" _colldef = colldef _mklocale = mklocale _monetdef = monetdef _msgdef = msgdef _numericdef = numericdef _timedef = timedef .endif .if ${MK_MAKE} != "no" _mk= mk .endif .if ${MK_MAN} != "no" _man= man .endif .if ${MK_SENDMAIL} != "no" _sendmail= sendmail .endif .if ${MK_SHAREDOCS} != "no" _doc= doc .endif .if ${MK_SYSCONS} != "no" _syscons= syscons .endif .if ${MK_TESTS} != "no" _tests= tests .endif .if ${MK_VT} != "no" _vt= vt .endif .if ${MK_ZONEINFO} != "no" _zoneinfo= zoneinfo .endif +SUBDIR_PARALLEL= + .include Index: head/share/doc/Makefile =================================================================== --- head/share/doc/Makefile (revision 289392) +++ head/share/doc/Makefile (revision 289393) @@ -1,35 +1,37 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ .include SUBDIR= ${_IPv6} \ ${_atf} \ legal \ ${_llvm} \ ${_pjdfstest} \ ${_roffdocs} .if ${MK_TESTS} != "no" _atf= atf _pjdfstest= pjdfstest .endif .if ${MK_CLANG} != "no" _llvm= llvm .endif .if ${MK_INET6} != "no" _IPv6= IPv6 .endif # FIXME this is not a real solution ... .if ${MK_GROFF} != "no" _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 .include Index: head/share/doc/legal/Makefile =================================================================== --- head/share/doc/legal/Makefile (revision 289392) +++ head/share/doc/legal/Makefile (revision 289393) @@ -1,9 +1,11 @@ # $FreeBSD$ SUBDIR= intel_ipw \ intel_iwi \ intel_iwn \ intel_wpi \ realtek +SUBDIR_PARALLEL= + .include Index: head/share/doc/papers/Makefile =================================================================== --- head/share/doc/papers/Makefile (revision 289392) +++ head/share/doc/papers/Makefile (revision 289393) @@ -1,18 +1,20 @@ # $FreeBSD$ SUBDIR= beyond4.3 \ bufbio \ contents \ devfs \ diskperf \ fsinterface \ jail \ kernmalloc \ kerntune \ malloc \ newvm \ relengr \ sysperf \ timecounter +SUBDIR_PARALLEL= + .include Index: head/share/doc/psd/Makefile =================================================================== --- head/share/doc/psd/Makefile (revision 289392) +++ head/share/doc/psd/Makefile (revision 289393) @@ -1,40 +1,42 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD$ # The following modules do not build/install: # 10.gdb # The following modules do not apply to FreeBSD: # 07.pascal 08.f77 09.f77io # The following previously encumbered files have not yet been added to # the tree: # 11.adb SUBDIR= title \ contents \ 01.cacm \ 02.implement \ 03.iosys \ 04.uprog \ 05.sysman \ 06.Clang \ 12.make \ 13.rcs \ 15.yacc \ 16.lex \ 17.m4 \ 18.gprof \ 20.ipctut \ 21.ipc # The following modules don't appear in the O'Reilly book, but # are in the 4.4BSD distribution. SUBDIR+=22.rpcgen \ 23.rpc \ 24.xdr \ 25.xdrrfc \ 26.rpcrfc \ 27.nfsrpc +SUBDIR_PARALLEL= + .include Index: head/share/doc/smm/Makefile =================================================================== --- head/share/doc/smm/Makefile (revision 289392) +++ head/share/doc/smm/Makefile (revision 289393) @@ -1,35 +1,37 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/10/93 # $FreeBSD$ .include # The following modules do not describe FreeBSD: # 14.uucpimpl, 15.uucpnet # The following modules do not build/install: # 13.amd (documentation is TeXinfo) # 16.security 17.password (encumbered) SUBDIR= title \ contents \ 01.setup \ 02.config \ 03.fsck \ 04.quotas \ 05.fastfs \ 06.nfs \ ${_07.lpd} \ ${_08.sendmailop} \ 11.timedop \ 12.timed \ 18.net .if ${MK_SENDMAIL} != "no" _08.sendmailop= 08.sendmailop .endif .if ${MK_LPR} != "no" _07.lpd= 07.lpd .endif +SUBDIR_PARALLEL= + .include Index: head/share/doc/usd/Makefile =================================================================== --- head/share/doc/usd/Makefile (revision 289392) +++ head/share/doc/usd/Makefile (revision 289393) @@ -1,23 +1,24 @@ # From: @(#)Makefile 8.2 (Berkeley) 4/20/94 # $FreeBSD$ # The following modules are not provided: # 14.jove SUBDIR= title \ contents \ 04.csh \ 05.dc \ 06.bc \ 07.mail \ 10.exref \ 11.vitut \ 12.vi \ 13.viref \ 18.msdiffs \ 19.memacros \ 20.meref \ 21.troff \ 22.trofftut +SUBDIR_PARALLEL= .include Index: head/share/examples/Makefile =================================================================== --- head/share/examples/Makefile (revision 289392) +++ head/share/examples/Makefile (revision 289393) @@ -1,264 +1,266 @@ # $FreeBSD$ # # Doing a make install builds /usr/share/examples .include LDIRS= BSD_daemon \ FreeBSD_version \ IPv6 \ bootforth \ csh \ diskless \ drivers \ etc \ find_interface \ ibcs2 \ indent \ ipfw \ jails \ kld \ libvgl \ mdoc \ netgraph \ perfmon \ ppi \ ppp \ printing \ ses \ scsi_target \ sunrpc \ uefisign XFILES= BSD_daemon/FreeBSD.pfa \ BSD_daemon/README \ BSD_daemon/beastie.eps \ BSD_daemon/beastie.fig \ BSD_daemon/eps.patch \ BSD_daemon/poster.sh \ FreeBSD_version/FreeBSD_version.c \ FreeBSD_version/Makefile \ FreeBSD_version/README \ IPv6/USAGE \ bootforth/README \ bootforth/boot.4th \ bootforth/frames.4th \ bootforth/loader.rc \ bootforth/menu.4th \ bootforth/menuconf.4th \ bootforth/screen.4th \ csh/dot.cshrc \ diskless/ME \ diskless/README.BOOTP \ diskless/README.TEMPLATING \ diskless/clone_root \ drivers/README \ drivers/make_device_driver.sh \ drivers/make_pseudo_driver.sh \ etc/README.examples \ etc/bsd-style-copyright \ etc/make.conf \ find_interface/Makefile \ find_interface/README \ find_interface/find_interface.c \ ibcs2/README \ ibcs2/hello.uu \ indent/indent.pro \ ipfw/change_rules.sh \ jails/README \ kld/Makefile \ kld/cdev/Makefile \ kld/cdev/README \ kld/cdev/module/Makefile \ kld/cdev/module/cdev.c \ kld/cdev/module/cdev.h \ kld/cdev/module/cdevmod.c \ kld/cdev/test/Makefile \ kld/cdev/test/testcdev.c \ kld/dyn_sysctl/Makefile \ kld/dyn_sysctl/README \ kld/dyn_sysctl/dyn_sysctl.c \ kld/firmware/Makefile \ kld/firmware/README \ kld/firmware/fwconsumer/Makefile \ kld/firmware/fwconsumer/fw_consumer.c \ kld/firmware/fwimage/Makefile \ kld/firmware/fwimage/firmware.img.uu \ kld/khelp/Makefile \ kld/khelp/README \ kld/khelp/h_example.c \ kld/syscall/Makefile \ kld/syscall/module/Makefile \ kld/syscall/module/syscall.c \ kld/syscall/test/Makefile \ kld/syscall/test/call.c \ libvgl/Makefile \ libvgl/demo.c \ mdoc/POSIX-copyright \ mdoc/deshallify.sh \ mdoc/example.1 \ mdoc/example.3 \ mdoc/example.4 \ mdoc/example.9 \ netgraph/ether.bridge \ netgraph/frame_relay \ netgraph/ngctl \ netgraph/raw \ netgraph/udp.tunnel \ netgraph/virtual.chain \ netgraph/virtual.lan \ perfmon/Makefile \ perfmon/README \ perfmon/perfmon.c \ ppi/Makefile \ ppi/ppilcd.c \ ppp/chap-auth \ ppp/login-auth \ ppp/ppp.conf.sample \ ppp/ppp.conf.span-isp \ ppp/ppp.conf.span-isp.working \ ppp/ppp.linkdown.sample \ ppp/ppp.linkdown.span-isp \ ppp/ppp.linkdown.span-isp.working \ ppp/ppp.linkup.sample \ ppp/ppp.linkup.span-isp \ ppp/ppp.linkup.span-isp.working \ ppp/ppp.secret.sample \ ppp/ppp.secret.span-isp \ ppp/ppp.secret.span-isp.working \ printing/README \ printing/diablo-if-net \ printing/hpdf \ printing/hpif \ printing/hpof \ printing/hprf \ printing/hpvf \ printing/if-simple \ printing/if-simpleX \ printing/ifhp \ printing/make-ps-header \ printing/netprint \ printing/psdf \ printing/psdfX \ printing/psif \ printing/pstf \ printing/pstfX \ ses/Makefile \ ses/Makefile.inc \ ses/getencstat/Makefile \ ses/getencstat/getencstat.0 \ ses/sesd/Makefile \ ses/sesd/sesd.0 \ ses/setencstat/Makefile \ ses/setencstat/setencstat.0 \ ses/setobjstat/Makefile \ ses/setobjstat/setobjstat.0 \ ses/srcs/chpmon.c \ ses/srcs/eltsub.c \ ses/srcs/eltsub.h \ ses/srcs/getencstat.c \ ses/srcs/getnobj.c \ ses/srcs/getobjmap.c \ ses/srcs/getobjstat.c \ ses/srcs/inienc.c \ ses/srcs/sesd.c \ ses/srcs/setencstat.c \ ses/srcs/setobjstat.c \ scsi_target/Makefile \ scsi_target/scsi_target.c \ scsi_target/scsi_target.h \ scsi_target/scsi_target.8 \ scsi_target/scsi_cmds.c \ sunrpc/Makefile \ sunrpc/dir/Makefile \ sunrpc/dir/dir.x \ sunrpc/dir/dir_proc.c \ sunrpc/dir/rls.c \ sunrpc/msg/Makefile \ sunrpc/msg/msg.x \ sunrpc/msg/msg_proc.c \ sunrpc/msg/printmsg.c \ sunrpc/msg/rprintmsg.c \ sunrpc/sort/Makefile \ sunrpc/sort/rsort.c \ sunrpc/sort/sort.x \ sunrpc/sort/sort_proc.c \ uefisign/uefikeys BINDIR= ${SHAREDIR}/examples NO_OBJ= .if ${MK_HAST} != "no" LDIRS+= hast XFILES+= hast/ucarp.sh \ hast/ucarp_down.sh \ hast/ucarp_up.sh \ hast/vip-down.sh \ hast/vip-up.sh .endif .if ${MK_USB} != "no" LDIRS+= libusb20 XFILES+= libusb20/Makefile \ libusb20/README \ libusb20/util.c \ libusb20/util.h \ libusb20/bulk.c \ libusb20/control.c .endif .if ${MACHINE_CPUARCH} == "amd64" .if ${MK_BHYVE} != "no" LDIRS+= bhyve XFILES+= bhyve/vmrun.sh .endif .endif # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''); (latter useful # in environments where it's not possible to keep /sys publicly readable) SHARED?= copies beforeinstall: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples copies: .for i in ${LDIRS} if [ -L ${DESTDIR}${BINDIR}/$i ]; then \ rm -f ${DESTDIR}${BINDIR}/$i; \ fi .endfor mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f ${.CURDIR}/../../etc/mtree/BSD.usr.dist -p ${DESTDIR}/usr .for file in ${XFILES} ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ ${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file} .endfor symlinks: .for i in ${LDIRS} rm -rf ${DESTDIR}${BINDIR}/$i ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i .endfor etc-examples: .if ${SHARED} != "symlinks" (cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) .endif .if ${SHARED} != "symlinks" SUBDIR= smbfs .if ${MK_IPFILTER} != "no" SUBDIR+=ipfilter .endif .if ${MK_PF} != "no" SUBDIR+=pf .endif .endif .if ${MK_TESTS} != "no" SUBDIR+=tests .endif +SUBDIR_PARALLEL= + .include Index: head/share/i18n/Makefile =================================================================== --- head/share/i18n/Makefile (revision 289392) +++ head/share/i18n/Makefile (revision 289393) @@ -1,8 +1,9 @@ # $FreeBSD$ # $NetBSD: Makefile,v 1.1 2003/06/27 08:39:59 tshiozak Exp $ .include SUBDIR= csmapper esdb +SUBDIR_PARALLEL= .include Index: head/share/i18n/csmapper/Makefile =================================================================== --- head/share/i18n/csmapper/Makefile (revision 289392) +++ head/share/i18n/csmapper/Makefile (revision 289393) @@ -1,37 +1,38 @@ # $FreeBSD$ # $NetBSD: Makefile,v 1.13 2007/03/13 16:34:37 tnozaki Exp $ 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 \ cat $$i/mapper.dir.$$i; \ done); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} mapper.dir.db: mapper.dir ${MKCSMAPPER} -m -o ${.TARGET} ${.ALLSRC} FILES+= mapper.dir mapper.dir.db CLEANFILES+= mapper.dir mapper.dir.db charset.pivot: ${SUBDIR} newfile=$$(for i in ${SUBDIR}; do \ cat $$i/charset.pivot.$$i; \ done); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} charset.pivot.pvdb: charset.pivot ${MKCSMAPPER} -p -o ${.TARGET} ${.ALLSRC} FILES+= charset.pivot charset.pivot.pvdb CLEANFILES+= charset.pivot charset.pivot.pvdb all: ${FILES} realall: ${FILES} .include "./Makefile.inc" .include Index: head/share/i18n/esdb/Makefile =================================================================== --- head/share/i18n/esdb/Makefile (revision 289392) +++ head/share/i18n/esdb/Makefile (revision 289393) @@ -1,34 +1,35 @@ # $FreeBSD$ # $NetBSD: Makefile,v 1.14 2007/04/01 18:52:30 tnozaki Exp $ 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} esdb.dir: ${SUBDIR} newfile=$$(for i in ${SUBDIR}; do \ cat $$i/esdb.dir.$$i; \ done); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} esdb.dir.db: esdb.dir ${MKESDB} -m -o ${.TARGET} ${.ALLSRC} esdb.alias: ${SUBDIR} newfile=$$(for i in ${SUBDIR}; do \ cat $$i/esdb.alias.$$i; \ done); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} esdb.alias.db: esdb.alias ${MKESDB} -m -o ${.TARGET} ${.ALLSRC} all: ${FILES} realall: ${FILES} .include "./Makefile.inc" .include Index: head/share/man/Makefile =================================================================== --- head/share/man/Makefile (revision 289392) +++ head/share/man/Makefile (revision 289393) @@ -1,20 +1,21 @@ # @(#)Makefile 8.2 (Berkeley) 4/16/94 # $FreeBSD$ .include # XXX MISSING: man3f SUBDIR= man1 man3 man4 man5 man6 man7 man8 man9 +SUBDIR_PARALLEL= MAKEWHATIS?= makewhatis makedb: .if ${MK_MAN_UTILS} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/man .if ${MK_OPENSSL} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man .endif .endif .include "${.CURDIR}/../Makefile.inc" .include Index: head/share/syscons/Makefile =================================================================== --- head/share/syscons/Makefile (revision 289392) +++ head/share/syscons/Makefile (revision 289393) @@ -1,5 +1,6 @@ # $FreeBSD$ SUBDIR= fonts keymaps scrnmaps +SUBDIR_PARALLEL= .include Index: head/tests/Makefile =================================================================== --- head/tests/Makefile (revision 289392) +++ head/tests/Makefile (revision 289393) @@ -1,15 +1,16 @@ # $FreeBSD$ .include SUBDIR+= etc SUBDIR+= sys +SUBDIR_PARALLEL= TESTSDIR= ${TESTSBASE} KYUAFILE= yes afterinstall: install-tests-local install-tests-local: .PHONY ${INSTALL_SYMLINK} ../local/tests ${DESTDIR}${TESTSDIR}/local .include Index: head/tests/sys/Makefile =================================================================== --- head/tests/sys/Makefile (revision 289392) +++ head/tests/sys/Makefile (revision 289393) @@ -1,21 +1,23 @@ # $FreeBSD$ .include TESTSDIR= ${TESTSBASE}/sys TESTS_SUBDIRS+= aio TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mqueue TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto TESTS_SUBDIRS+= vfs TESTS_SUBDIRS+= vm # Items not integrated into kyua runs by default SUBDIR+= pjdfstest +SUBDIR_PARALLEL= + .include Index: head/tests/sys/pjdfstest/Makefile =================================================================== --- head/tests/sys/pjdfstest/Makefile (revision 289392) +++ head/tests/sys/pjdfstest/Makefile (revision 289393) @@ -1,6 +1,7 @@ # $FreeBSD$ SUBDIR+= pjdfstest SUBDIR+= tests +SUBDIR_PARALLEL= .include Index: head/tests/sys/pjdfstest/tests/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/Makefile (revision 289392) +++ head/tests/sys/pjdfstest/tests/Makefile (revision 289393) @@ -1,39 +1,41 @@ # $FreeBSD$ PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest TESTSDIR= ${TESTSBASE}/sys/pjdfstest .PATH: ${.CURDIR} FILESDIR= ${TESTSDIR} FILES= conf FILES+= misc.sh CLEANFILES+= misc.sh misc.sh.tmp misc.sh: ${PJDFSTEST_SRCDIR}/tests/misc.sh sed -e '\,maindir=,s,maindir=.*,maindir=`dirname $$0`/../,' < ${.ALLSRC} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} afterinstall: install-tests-symlink install-tests-symlink: .PHONY rm -f ${DESTDIR}${TESTSDIR}/tests ${INSTALL_SYMLINK} . ${DESTDIR}${TESTSDIR}/tests TESTS_SUBDIRS= chflags TESTS_SUBDIRS+= chmod TESTS_SUBDIRS+= chown TESTS_SUBDIRS+= ftruncate TESTS_SUBDIRS+= granular TESTS_SUBDIRS+= link TESTS_SUBDIRS+= mkdir TESTS_SUBDIRS+= mkfifo TESTS_SUBDIRS+= mknod TESTS_SUBDIRS+= open TESTS_SUBDIRS+= rename TESTS_SUBDIRS+= rmdir TESTS_SUBDIRS+= symlink TESTS_SUBDIRS+= truncate TESTS_SUBDIRS+= unlink +SUBDIR_PARALLEL= + .include