Index: stable/10/bin/Makefile =================================================================== --- stable/10/bin/Makefile (revision 264302) +++ stable/10/bin/Makefile (revision 264303) @@ -1,63 +1,65 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ .include SUBDIR= cat \ chflags \ chio \ chmod \ cp \ date \ dd \ df \ domainname \ echo \ ed \ expr \ freebsd-version \ getfacl \ hostname \ kenv \ kill \ ln \ ls \ mkdir \ mv \ pax \ pkill \ ps \ pwait \ pwd \ realpath \ rm \ rmdir \ setfacl \ sh \ sleep \ stty \ sync \ test \ uuidgen .if ${MK_RCMDS} != "no" SUBDIR+= rcp .endif .if ${MK_SENDMAIL} != "no" SUBDIR+= rmail .endif .if ${MK_TCSH} != "no" SUBDIR+= csh .endif .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Index: stable/10/gnu/usr.bin/Makefile =================================================================== --- stable/10/gnu/usr.bin/Makefile (revision 264302) +++ stable/10/gnu/usr.bin/Makefile (revision 264303) @@ -1,49 +1,51 @@ # $FreeBSD$ .include SUBDIR= ${_binutils} \ ${_cc} \ dialog \ diff \ diff3 \ ${_dtc} \ ${_gdb} \ ${_gperf} \ grep \ ${_groff} \ ${_rcs} \ sdiff \ send-pr \ ${_texinfo} .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" _groff= groff .endif .endif .if ${MK_GPL_DTC} != "no" _dtc= dtc .endif .if ${MK_INFO} != "no" _texinfo= texinfo .endif .if ${MK_RCS} != "no" _rcs= rcs .endif .if ${MK_BINUTILS} != "no" _binutils= binutils .endif .if ${MK_GCC} != "no" _cc= cc .endif .if ${MK_GDB} != "no" _gdb= gdb .endif +SUBDIR_PARALLEL= + .include Index: stable/10/lib/Makefile =================================================================== --- stable/10/lib/Makefile (revision 264302) +++ stable/10/lib/Makefile (revision 264303) @@ -1,274 +1,278 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ .include # To satisfy shared library or ELF linkage when only the libraries being # built are visible: # # csu must be built before all shared libaries for ELF. # libc must be built before all other shared libraries. # libbsm must be built before libauditd. # libcom_err must be built before libpam. # libcrypt must be built before libpam. # libkvm must be built before libdevstat. # libldns must be built before libunbound. # msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, and libtacplus. # ncurses must be built before libdialog, libedit and libreadline. # libnetgraph must be built before libbsnmp/modules/snmp_netgraph. # libopie must be built before libpam. # libradius must be built before libpam. # librpcsvc must be built before libpam. # libsbuf must be built before libcam. # libtacplus must be built before libpam. # libutil must be built before libpam. # libypclnt must be built before libpam. # libgssapi must be built before librpcsec_gss # # Otherwise, the SUBDIR list should be in alphabetical order. # # Except it appears bind needs to be compiled last SUBDIR_ORDERED= ${_csu} \ libc \ libc_nonshared \ libbsm \ libauditd \ libcompiler_rt \ libcrypt \ libelf \ ${_libiconv_modules} \ libkvm \ ${_libldns} \ msun \ libmd \ ncurses \ ${_libnetgraph} \ libradius \ librpcsvc \ libsbuf \ libtacplus \ libutil \ ${_libypclnt} \ ${_libcxxrt} \ ${_libcplusplus} .if ${MK_KERBEROS_SUPPORT} != "no" SUBDIR_ORDERED+= libcom_err .endif SUBDIR= ${SUBDIR_ORDERED} \ libalias \ libarchive \ ${_libatm} \ libbegemot \ libblocksruntime \ ${_libbluetooth} \ ${_libbsnmp} \ libbz2 \ libcalendar \ libcam \ libcompat \ libdevinfo \ libdevstat \ libdwarf \ libedit \ ${_libefi} \ libexecinfo \ libexpat \ libfetch \ libgeom \ ${_libgpib} \ ${_libgssapi} \ ${_librpcsec_gss} \ libipsec \ ${_libipx} \ libjail \ libkiconv \ liblzma \ libmagic \ libmandoc \ libmemstat \ ${_libmilter} \ ${_libmp} \ ${_libnandfs} \ libnetbsd \ ${_libngatm} \ libopie \ libpam \ libpcap \ ${_libpmc} \ ${_libproc} \ libprocstat \ librt \ ${_librtld_db} \ ${_libsdp} \ ${_libsm} \ ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ libstand \ libstdbuf \ libstdthreads \ ${_libtelnet} \ ${_libthr} \ libthread_db \ libucl \ libufs \ libugidfw \ libulog \ ${_libunbound} \ ${_libusbhid} \ ${_libusb} \ ${_libvgl} \ ${_libvmmapi} \ libwrap \ liby \ libyaml \ libz \ ${_atf} \ ${_clang} \ ${_tests} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf .elif exists(${.CURDIR}/csu/${MACHINE_ARCH}) _csu=csu/${MACHINE_ARCH} .elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}/Makefile) _csu=csu/${MACHINE_CPUARCH} .else _csu=csu .endif # NB: keep these sorted by MK_* knobs .if ${MK_ATM} != "no" _libngatm= libngatm .endif .if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp .endif .if ${MK_BSNMP} != "no" _libbsnmp= libbsnmp .endif .if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif .if ${MK_GPIB} != "no" _libgpib= libgpib .endif .if ${MK_GSSAPI} != "no" _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss .endif .if ${MK_ICONV} != "no" _libiconv_modules= libiconv_modules .endif .if ${MK_IPX} != "no" _libipx= libipx .endif .if ${MK_LDNS} != "no" _libldns= libldns .endif .if ${MK_LIBCPLUSPLUS} != "no" _libcxxrt= libcxxrt _libcplusplus= libc++ .endif .if ${MK_LIBTHR} != "no" _libthr= libthr .endif .if ${MK_NAND} != "no" _libnandfs= libnandfs .endif .if ${MK_NETGRAPH} != "no" _libnetgraph= libnetgraph .endif .if ${MK_NIS} != "no" _libypclnt= libypclnt .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db .endif .if ${MACHINE_CPUARCH} == "amd64" _libvmmapi= libvmmapi .endif .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi _libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "mips" _libproc= libproc _librtld_db= librtld_db .endif .if ${MACHINE_CPUARCH} == "powerpc" _libproc= libproc _librtld_db= librtld_db _libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "sparc64" _libsmb= libsmb .endif .if ${MK_OPENSSL} != "no" _libmp= libmp .endif .if ${MK_PMC} != "no" _libpmc= libpmc .endif .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm _libsmdb= libsmdb _libsmutil= libsmutil .endif .if ${MK_TELNET} != "no" _libtelnet= libtelnet .endif .if ${MK_TESTS} != "no" _atf= atf _tests= tests .endif .if ${MK_UNBOUND} != "no" _libunbound= libunbound .endif .if ${MK_USB} != "no" _libusbhid= libusbhid _libusb= libusb .endif .if !defined(LIBRARIES_ONLY) afterinstall: ${INSTALL_SYMLINK} ../include ${DESTDIR}/usr/lib/include .endif +.if !make(install) +SUBDIR_PARALLEL= +.endif + .include Index: stable/10/lib/clang/Makefile =================================================================== --- stable/10/lib/clang/Makefile (revision 264302) +++ stable/10/lib/clang/Makefile (revision 264303) @@ -1,150 +1,152 @@ # $FreeBSD$ .include .if !make(install) .if !defined(EARLY_BUILD) .if defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no" _libclangstaticanalyzer= \ libclangstaticanalyzercheckers \ libclangstaticanalyzercore \ libclangstaticanalyzerfrontend _libclangarcmigrate= \ libclangarcmigrate .endif # MK_CLANG_FULL .if (defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no") || \ (defined(MK_LLDB) && ${MK_LLDB} != "no") _libclangrewriter= \ libclangrewritecore \ libclangrewritefrontend .endif # (MK_CLANG_FULL || MK_LLDB) .endif # !EARLY_BUILD SUBDIR= libclanganalysis \ ${_libclangarcmigrate} \ libclangast \ libclangbasic \ libclangcodegen \ libclangdriver \ libclangedit \ libclangfrontend \ libclangfrontendtool \ libclanglex \ libclangparse \ ${_libclangrewriter} \ libclangsema \ libclangserialization \ ${_libclangstaticanalyzer} \ \ libllvmanalysis \ libllvmasmparser \ libllvmasmprinter \ libllvmbitreader \ libllvmbitwriter \ libllvmcodegen \ libllvmcore \ libllvminstcombine \ libllvminstrumentation \ libllvmipa \ libllvmipo \ libllvmirreader \ libllvmlinker \ libllvmmc \ libllvmmcparser \ libllvmobjcarcopts \ libllvmobject \ libllvmoption \ libllvmscalaropts \ libllvmselectiondag \ libllvmsupport \ libllvmtablegen \ libllvmtarget \ libllvmtransformutils \ libllvmvectorize \ \ libllvmarmasmparser \ libllvmarmcodegen \ libllvmarmdesc \ libllvmarmdisassembler \ libllvmarminfo \ libllvmarminstprinter \ libllvmmipsasmparser \ libllvmmipscodegen \ libllvmmipsdesc \ libllvmmipsdisassembler \ libllvmmipsinfo \ libllvmmipsinstprinter \ libllvmpowerpcasmparser \ libllvmpowerpccodegen \ libllvmpowerpcdesc \ libllvmpowerpcinfo \ libllvmpowerpcinstprinter \ libllvmsparcasmparser \ libllvmsparccodegen \ libllvmsparcdesc \ libllvmsparcdisassembler \ libllvmsparcinfo \ libllvmsparcinstprinter \ libllvmx86asmparser \ libllvmx86codegen \ libllvmx86desc \ libllvmx86disassembler \ libllvmx86info \ libllvmx86instprinter \ libllvmx86utils .if ${MK_CLANG_EXTRAS} != "no" SUBDIR+=libllvmdebuginfo .endif # MK_CLANG_EXTRAS .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" SUBDIR+=libllvmexecutionengine \ libllvminterpreter \ libllvmjit \ libllvmmcdisassembler \ libllvmmcjit \ libllvmruntimedyld .endif # MK_CLANG_EXTRAS | LLDB .if !defined(EARLY_BUILD) && ${MK_LLDB} != "no" SUBDIR+=liblldb \ \ liblldbAPI \ liblldbBreakpoint \ liblldbCommands \ liblldbCore \ liblldbDataFormatters \ liblldbExpression \ liblldbHostCommon \ liblldbHostFreeBSD \ liblldbInterpreter \ liblldbSymbol \ liblldbTarget \ liblldbUtility \ \ liblldbPluginABISysV_x86_64 \ liblldbPluginCXXItaniumABI \ liblldbPluginDisassemblerLLVM \ liblldbPluginDynamicLoaderStatic \ liblldbPluginDynamicLoaderPosixDYLD \ liblldbPluginInstructionARM \ liblldbPluginObjectContainerBSDArchive \ liblldbPluginObjectFileELF \ liblldbPluginPlatformFreeBSD \ liblldbPluginPlatformGDB \ liblldbPluginProcessElfCore \ liblldbPluginProcessFreeBSD \ liblldbPluginProcessGDBRemote \ liblldbPluginProcessPOSIX \ liblldbPluginProcessUtility \ liblldbPluginSymbolFileDWARF \ liblldbPluginSymbolFileSymtab \ liblldbPluginSymbolVendorELF \ liblldbPluginUnwindAssemblyInstEmulation \ liblldbPluginUnwindAssemblyX86 .endif # !EARLY_BUILD && MK_LLDB .endif # !make(install) SUBDIR+= include +SUBDIR_PARALLEL= + .include Index: stable/10/sbin/Makefile =================================================================== --- stable/10/sbin/Makefile (revision 264302) +++ stable/10/sbin/Makefile (revision 264303) @@ -1,121 +1,123 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # $FreeBSD$ .include # XXX MISSING: icheck ncheck SUBDIR=adjkerntz \ badsect \ camcontrol \ ccdconfig \ clri \ comcontrol \ conscontrol \ ddb \ devfs \ dhclient \ dmesg \ dump \ dumpfs \ dumpon \ etherswitchcfg \ ffsinfo \ fsck \ fsck_ffs \ fsck_msdosfs \ fsdb \ fsirand \ gbde \ geom \ ggate \ growfs \ gvinum \ hastctl \ hastd \ ifconfig \ init \ iscontrol \ kldconfig \ kldload \ kldstat \ kldunload \ ldconfig \ md5 \ mdconfig \ mdmfs \ mknod \ mksnap_ffs \ mount \ mount_cd9660 \ mount_fusefs \ mount_msdosfs \ mount_nfs \ mount_nullfs \ mount_udf \ mount_unionfs \ newfs \ newfs_msdos \ nfsiod \ nos-tun \ ping \ rcorder \ reboot \ recoverdisk \ resolvconf \ restore \ route \ savecore \ setkey \ shutdown \ spppcontrol \ swapon \ sysctl \ tunefs \ umount \ .if ${MK_ATM} != "no" SUBDIR+= atm .endif .if ${MK_CXX} != "no" SUBDIR+= devd .endif .if ${MK_IPFILTER} != "no" SUBDIR+= ipf .endif .if ${MK_IPFW} != "no" SUBDIR+= ipfw SUBDIR+= natd .endif .if ${MK_NAND} != "no" SUBDIR+= nandfs SUBDIR+= newfs_nandfs .endif .if ${MK_PF} != "no" SUBDIR+= pfctl SUBDIR+= pflogd .endif .if ${MK_INET6} != "no" SUBDIR+= ping6 SUBDIR+= rtsol .endif .if ${MK_QUOTAS} != "no" SUBDIR+= quotacheck .endif .if ${MK_ROUTED} != "no" SUBDIR+= routed .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Index: stable/10/share/mk/bsd.subdir.mk =================================================================== --- stable/10/share/mk/bsd.subdir.mk (revision 264302) +++ stable/10/share/mk/bsd.subdir.mk (revision 264303) @@ -1,99 +1,118 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # $FreeBSD$ # # The include file contains the default targets # for building subdirectories. # # For all of the directories listed in the variable SUBDIRS, the # specified directory will be visited and the target made. There is # also a default target which allows the command "make subdir" where # subdir is any directory listed in the variable SUBDIRS. # # # +++ variables +++ # # DISTRIBUTION Name of distribution. [base] # # SUBDIR A list of subdirectories that should be built as well. # Each of the targets will execute the same target in the # subdirectories. # # +++ targets +++ # # distribute: # This is a variant of install, which will # put the stuff into the right "distribution". # # afterinstall, all, all-man, beforeinstall, checkdpadd, clean, # cleandepend, cleandir, cleanilinks depend, install, lint, # maninstall, manlint, obj, objlink, realinstall, regress, tags # .if !target(____) ____: .include DISTRIBUTION?= base .if !target(distribute) distribute: .MAKE .for dist in ${DISTRIBUTION} ${_+_}cd ${.CURDIR}; \ ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies .endfor .endif _SUBDIR: .USE .MAKE .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR) @${_+_}set -e; for entry in ${SUBDIR}; do \ if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH} (${.TARGET:realinstall=install})"; \ edir=$${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ else \ ${ECHODIR} "===> ${DIRPRFX}$$entry (${.TARGET:realinstall=install})"; \ edir=$${entry}; \ cd ${.CURDIR}/$${edir}; \ fi; \ ${MAKE} ${.TARGET:realinstall=install} \ DIRPRFX=${DIRPRFX}$$edir/; \ done .endif ${SUBDIR}: .PHONY .MAKE ${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \ cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \ else \ cd ${.CURDIR}/${.TARGET}; \ fi; \ ${MAKE} all .for __target in all all-man checkdpadd clean cleandepend cleandir \ cleanilinks depend distribute lint maninstall manlint obj objlink \ realinstall regress tags ${SUBDIR_TARGETS} +.ifdef SUBDIR_PARALLEL +.for __dir in ${SUBDIR} +${__target}: ${__target}_subdir_${__dir} +${__target}_subdir_${__dir}: .MAKE + @${_+_}set -e; \ + if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \ + ${ECHODIR} "===> ${DIRPRFX}${__dir}.${MACHINE_ARCH} (${__target:realinstall=install})"; \ + edir=${__dir}.${MACHINE_ARCH}; \ + cd ${.CURDIR}/$${edir}; \ + else \ + ${ECHODIR} "===> ${DIRPRFX}${__dir} (${__target:realinstall=install})"; \ + edir=${__dir}; \ + cd ${.CURDIR}/$${edir}; \ + fi; \ + ${MAKE} ${__target:realinstall=install} \ + DIRPRFX=${DIRPRFX}$$edir/ +.endfor +.else ${__target}: _SUBDIR +.endif .endfor .for __target in files includes .for __stage in build install ${__stage}${__target}: .if make(${__stage}${__target}) ${__stage}${__target}: _SUBDIR .endif .endfor ${__target}: .MAKE ${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target} .endfor .if !target(install) .if !target(beforeinstall) beforeinstall: .endif .if !target(afterinstall) afterinstall: .endif install: beforeinstall realinstall afterinstall .ORDER: beforeinstall realinstall afterinstall .endif .endif Index: stable/10/usr.bin/Makefile =================================================================== --- stable/10/usr.bin/Makefile (revision 264302) +++ stable/10/usr.bin/Makefile (revision 264303) @@ -1,379 +1,381 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD$ .include # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend # XXX Use GNU versions: diff ld patch # Moved to secure: bdes # SUBDIR= alias \ apply \ asa \ ${_atf} \ awk \ banner \ basename \ brandelf \ bsdiff \ bzip2 \ bzip2recover \ cap_mkdb \ chat \ chpass \ cksum \ ${_clang} \ cmp \ col \ colldef \ colrm \ column \ comm \ compress \ cpuset \ csplit \ ctlstat \ cut \ dirname \ dtc \ du \ ee \ elf2aout \ elfdump \ enigma \ env \ expand \ false \ fetch \ file \ find \ finger \ fmt \ fold \ fstat \ fsync \ ftp \ gcore \ gencat \ getconf \ getent \ getopt \ grep \ gzip \ head \ hexdump \ ${_iconv} \ id \ ipcrm \ ipcs \ iscsictl \ join \ jot \ ${_kdump} \ keylogin \ keylogout \ killall \ ktrace \ ktrdump \ lam \ lastcomm \ ldd \ leave \ less \ lessecho \ lesskey \ limits \ locale \ lock \ lockf \ logger \ login \ logins \ logname \ look \ lorder \ lsvfs \ lzmainfo \ m4 \ ${_makewhatis} \ ${_man} \ mandoc \ mesg \ minigzip \ ministat \ ${_mkcsmapper} \ mkdep \ ${_mkesdb} \ mkfifo \ mklocale \ mktemp \ mkulzma \ mkuzip \ mt \ ncal \ netstat \ newgrp \ nfsstat \ nice \ nl \ nohup \ opieinfo \ opiekey \ opiepasswd \ pagesize \ passwd \ paste \ patch \ pathchk \ perror \ pr \ printenv \ printf \ procstat \ protect \ rctl \ renice \ rev \ revoke \ rpcinfo \ rs \ rup \ rusers \ rwall \ script \ sed \ seq \ shar \ showmount \ sockstat \ sort \ split \ stat \ stdbuf \ su \ systat \ tabs \ tail \ talk \ tar \ tcopy \ tee \ ${_tests} \ tftp \ time \ tip \ top \ touch \ tput \ tr \ true \ truncate \ ${_truss} \ tset \ tsort \ tty \ uname \ unexpand \ uniq \ unzip \ units \ unvis \ uudecode \ uuencode \ vi \ vis \ vmstat \ w \ wall \ wc \ what \ whereis \ which \ whois \ write \ xargs \ xinstall \ ${_xlint} \ ${_xstr} \ xz \ xzdec \ ${_yacc} \ yes \ ${_ypcat} \ ${_ypmatch} \ ${_ypwhich} # NB: keep these sorted by MK_* knobs .if ${MK_AT} != "no" SUBDIR+= at .endif .if ${MK_ATM} != "no" SUBDIR+= atm .endif .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif .if ${MK_BSD_CPIO} != "no" SUBDIR+= cpio .endif .if ${MK_CALENDAR} != "no" SUBDIR+= calendar .endif .if ${MK_CLANG} != "no" _clang= clang .endif .if ${MK_GROFF} != "no" SUBDIR+= vgrind .endif .if ${MK_HESIOD} != "no" SUBDIR+= hesinfo .endif .if ${MK_ICONV} != "no" _iconv= iconv _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif .if ${MK_KDUMP} != "no" SUBDIR+= kdump SUBDIR+= truss .endif .if ${MK_KERBEROS_SUPPORT} != "no" SUBDIR+= compile_et .endif .if ${MK_LDNS_UTILS} != "no" SUBDIR+= drill SUBDIR+= host .endif .if ${MK_LIBTHR} != "no" SUBDIR+= csup .endif .if ${MK_LOCATE} != "no" SUBDIR+= locate .endif # XXX msgs? .if ${MK_MAIL} != "no" SUBDIR+= biff SUBDIR+= from SUBDIR+= mail SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" .if ${MK_BMAKE} != "no" SUBDIR+= bmake .else SUBDIR+= make .endif .endif .if ${MK_MAN_UTILS} != "no" SUBDIR+= catman _makewhatis= makewhatis _man= man .endif .if ${MK_NETCAT} != "no" SUBDIR+= nc .endif .if ${MK_NIS} != "no" SUBDIR+= ypcat SUBDIR+= ypmatch SUBDIR+= ypwhich .endif .if ${MK_OPENSSH} != "no" SUBDIR+= ssh-copy-id .endif .if ${MK_OPENSSL} != "no" SUBDIR+= bc SUBDIR+= chkey SUBDIR+= dc SUBDIR+= newkey .endif .if ${MK_QUOTAS} != "no" SUBDIR+= quota .endif .if ${MK_RCMDS} != "no" SUBDIR+= rlogin SUBDIR+= rsh SUBDIR+= ruptime SUBDIR+= rwho .endif .if ${MK_SENDMAIL} != "no" SUBDIR+= vacation .endif .if ${MK_TELNET} != "no" SUBDIR+= telnet .endif .if ${MK_TESTS} != "no" _atf= atf _tests= tests .endif .if ${MK_TEXTPROC} != "no" SUBDIR+= checknr SUBDIR+= colcrt SUBDIR+= ul .endif .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 SUBDIR+= c99 SUBDIR+= ctags SUBDIR+= file2c SUBDIR+= gprof SUBDIR+= indent SUBDIR+= lex SUBDIR+= mkstr SUBDIR+= rpcgen SUBDIR+= unifdef SUBDIR+= xlint SUBDIR+= xstr SUBDIR+= yacc .endif .if ${MK_USB} != "no" SUBDIR+= usbhidaction SUBDIR+= usbhidctl .endif .if ${MK_UTMPX} != "no" SUBDIR+= last SUBDIR+= users SUBDIR+= who .endif .if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes" SUBDIR+= svn .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Index: stable/10/usr.bin/clang/Makefile =================================================================== --- stable/10/usr.bin/clang/Makefile (revision 264302) +++ stable/10/usr.bin/clang/Makefile (revision 264303) @@ -1,32 +1,34 @@ # $FreeBSD$ .include SUBDIR= clang clang-tblgen tblgen .if !defined(TOOLS_PREFIX) .if ${MK_CLANG_EXTRAS} != "no" SUBDIR+=bugpoint \ llc \ lli \ llvm-ar \ llvm-as \ llvm-bcanalyzer \ llvm-diff \ llvm-dis \ llvm-extract \ llvm-link \ llvm-mc \ llvm-nm \ llvm-objdump \ llvm-rtdyld \ macho-dump \ opt .endif .if ${MK_LLDB} != "no" SUBDIR+=lldb .endif .endif # TOOLS_PREFIX +SUBDIR_PARALLEL= + .include Index: stable/10/usr.sbin/Makefile =================================================================== --- stable/10/usr.sbin/Makefile (revision 264302) +++ stable/10/usr.sbin/Makefile (revision 264303) @@ -1,327 +1,329 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 # $FreeBSD$ .include SUBDIR= adduser \ arp \ bootparamd \ bsdconfig \ bsdinstall \ cdcontrol \ chkgrp \ chown \ chroot \ ckdist \ clear_locks \ crashinfo \ cron \ ctladm \ ctld \ daemon \ dconschat \ devinfo \ digictl \ diskinfo \ dumpcis \ etcupdate \ extattr \ extattrctl \ fifolog \ fwcontrol \ getfmac \ getpmac \ gstat \ i2c \ ifmcstat \ inetd \ iostat \ iscsid \ kldxref \ mailwrapper \ makefs \ memcontrol \ mergemaster \ mfiutil \ mixer \ mlxcontrol \ mountd \ mptutil \ mtest \ ${_mtree} \ newsyslog \ nfscbd \ nfsd \ nfsdumpstate \ nfsrevoke \ nfsuserd \ nmtree \ nologin \ ${_pc_sysinstall} \ pciconf \ periodic \ powerd \ procctl \ pstat \ pw \ pwd_mkdb \ quot \ rarpd \ rmt \ rpcbind \ rpc.lockd \ rpc.statd \ rpc.umntall \ rtprio \ service \ services_mkdb \ setfib \ setfmac \ setpmac \ smbmsg \ snapinfo \ spray \ syslogd \ sysrc \ tcpdchk \ tcpdmatch \ tcpdrop \ tcpdump \ timed \ traceroute \ trpt \ tzsetup \ ugidfw \ vipw \ wake \ watch \ watchdogd \ zic # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" SUBDIR+= accton SUBDIR+= sa .endif .if ${MK_AMD} != "no" SUBDIR+= amd .endif .if ${MK_AUDIT} != "no" SUBDIR+= audit SUBDIR+= auditd .if ${MK_OPENSSL} != "no" SUBDIR+= auditdistd .endif SUBDIR+= auditreduce SUBDIR+= praudit .endif .if ${MK_AUTHPF} != "no" SUBDIR+= authpf .endif .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif .if ${MK_BSNMP} != "no" SUBDIR+= bsnmpd .endif .if ${MK_CTM} != "no" SUBDIR+= ctm .endif .if ${MK_FLOPPY} != "no" SUBDIR+= fdcontrol SUBDIR+= fdformat SUBDIR+= fdread SUBDIR+= fdwrite .endif .if ${MK_FMTREE} != "no" SUBDIR+= mtree .endif .if ${MK_FREEBSD_UPDATE} != "no" SUBDIR+= freebsd-update .endif .if ${MK_GSSAPI} != "no" SUBDIR+= gssd .endif .if ${MK_GPIO} != "no" SUBDIR+= gpioctl .endif .if ${MK_INET6} != "no" SUBDIR+= faithd SUBDIR+= ip6addrctl SUBDIR+= mld6query SUBDIR+= ndp SUBDIR+= rip6query SUBDIR+= route6d SUBDIR+= rrenumd SUBDIR+= rtadvctl SUBDIR+= rtadvd SUBDIR+= rtsold SUBDIR+= traceroute6 .endif .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif .if ${MK_IPX} != "no" SUBDIR+= IPXrouted .endif .if ${MK_JAIL} != "no" SUBDIR+= jail SUBDIR+= jexec SUBDIR+= jls .endif # XXX MK_SYSCONS .if ${MK_LEGACY_CONSOLE} != "no" SUBDIR+= kbdcontrol SUBDIR+= kbdmap SUBDIR+= moused SUBDIR+= vidcontrol .endif .if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" .if ${MK_PPP} != "no" SUBDIR+= pppctl .endif .if ${MK_NS_CACHING} != "no" SUBDIR+= nscd .endif .endif .if ${MK_LPR} != "no" SUBDIR+= lpr .endif .if ${MK_MAN_UTILS} != "no" SUBDIR+= manctl .endif .if ${MK_NAND} != "no" SUBDIR+= nandsim SUBDIR+= nandtool .endif .if ${MK_NETGRAPH} != "no" SUBDIR+= flowctl SUBDIR+= lmcconfig SUBDIR+= ngctl SUBDIR+= nghook .endif .if ${MK_NIS} != "no" SUBDIR+= rpc.yppasswdd SUBDIR+= rpc.ypupdated SUBDIR+= rpc.ypxfrd SUBDIR+= ypbind SUBDIR+= yp_mkdb SUBDIR+= yppoll SUBDIR+= yppush SUBDIR+= ypserv SUBDIR+= ypset .endif .if ${MK_NTP} != "no" SUBDIR+= ntp .endif .if ${MK_OPENSSL} != "no" SUBDIR+= keyserv .endif .if ${MK_PC_SYSINSTALL} != "no" _pc_sysinstall= pc-sysinstall .endif .if ${MK_PF} != "no" SUBDIR+= ftp-proxy .endif .if ${MK_PKGBOOTSTRAP} != "no" SUBDIR+= pkg .endif .if ${MK_PKGTOOLS} != "no" SUBDIR+= pkg_install .endif # XXX MK_TOOLCHAIN? .if ${MK_PMC} != "no" SUBDIR+= pmcannotate SUBDIR+= pmccontrol SUBDIR+= pmcstat .endif .if ${MK_PORTSNAP} != "no" SUBDIR+= portsnap .endif .if ${MK_PPP} != "no" SUBDIR+= ppp .endif .if ${MK_QUOTAS} != "no" SUBDIR+= edquota SUBDIR+= quotaon SUBDIR+= repquota .endif .if ${MK_RCMDS} != "no" SUBDIR+= rwhod .endif .if ${MK_SENDMAIL} != "no" SUBDIR+= editmap SUBDIR+= mailstats SUBDIR+= makemap SUBDIR+= praliases SUBDIR+= sendmail .endif .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch .endif .if ${MK_UNBOUND} != "no" SUBDIR+= unbound .endif .if ${MK_USB} != "no" SUBDIR+= uathload SUBDIR+= uhsoctl SUBDIR+= usbconfig SUBDIR+= usbdump .endif .if ${MK_UTMPX} != "no" SUBDIR+= ac SUBDIR+= lastlogin SUBDIR+= utx .endif .if ${MK_WIRELESS} != "no" SUBDIR+= ancontrol SUBDIR+= wlandebug SUBDIR+= wpa .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Index: stable/10 =================================================================== --- stable/10 (revision 264302) +++ stable/10 (revision 264303) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r263778,263833 Index: stable/8/bin/Makefile =================================================================== --- stable/8/bin/Makefile (revision 264302) +++ stable/8/bin/Makefile (revision 264303) @@ -1,57 +1,59 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ .include SUBDIR= cat \ chflags \ chio \ chmod \ cp \ ${_csh} \ date \ dd \ df \ domainname \ echo \ ed \ expr \ getfacl \ hostname \ kenv \ kill \ ln \ ls \ mkdir \ mv \ pax \ pkill \ ps \ pwait \ pwd \ ${_rcp} \ realpath \ rm \ ${_rmail} \ rmdir \ setfacl \ sh \ sleep \ stty \ sync \ test \ uuidgen .if ${MK_RCMDS} != "no" _rcp= rcp .endif .if ${MK_SENDMAIL} != "no" _rmail= rmail .endif .if ${MK_TCSH} != "no" _csh= csh .endif +SUBDIR_PARALLEL= + .include Index: stable/8/bin =================================================================== --- stable/8/bin (revision 264302) +++ stable/8/bin (revision 264303) Property changes on: stable/8/bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin:r263778 Index: stable/8/gnu/usr.bin/Makefile =================================================================== --- stable/8/gnu/usr.bin/Makefile (revision 264302) +++ stable/8/gnu/usr.bin/Makefile (revision 264303) @@ -1,66 +1,68 @@ # $FreeBSD$ .include SUBDIR= bc \ ${_binutils} \ ${_cc} \ ${_cvs} \ dc \ dialog \ diff \ diff3 \ ${_gdb} \ ${_gperf} \ ${_grep} \ ${_groff} \ ${_man} \ patch \ ${_rcs} \ sdiff \ send-pr \ sort \ ${_texinfo} .if ${MACHINE_ARCH} == "mips" MK_GDB=no # not yet .endif .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" _groff= groff .endif .endif .if ${MK_CVS} != "no" _cvs= cvs .endif .if ${MK_GNU_GREP} != "no" _grep= grep .endif .if ${MK_INFO} != "no" _texinfo= texinfo .endif .if ${MK_MAN_UTILS} != "no" _man= man .endif .if ${MK_RCS} != "no" _rcs= rcs .endif .if ${MK_BINUTILS} != "no" _binutils= binutils .endif .if ${MK_GCC} != "no" _cc= cc .endif .if ${MK_GDB} != "no" _gdb= gdb .endif +SUBDIR_PARALLEL= + .include Property changes on: stable/8/gnu/usr.bin/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/Makefile:r263833 Index: stable/8/gnu/usr.bin =================================================================== --- stable/8/gnu/usr.bin (revision 264302) +++ stable/8/gnu/usr.bin (revision 264303) Property changes on: stable/8/gnu/usr.bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin:r263833 Index: stable/8/gnu =================================================================== --- stable/8/gnu (revision 264302) +++ stable/8/gnu (revision 264303) Property changes on: stable/8/gnu ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu:r263833 Index: stable/8/lib/Makefile =================================================================== --- stable/8/lib/Makefile (revision 264302) +++ stable/8/lib/Makefile (revision 264303) @@ -1,206 +1,210 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ .include # To satisfy shared library or ELF linkage when only the libraries being # built are visible: # # csu must be built before all shared libaries for ELF. # libc must be built before all other shared libraries. # libbsm must be built before ibauditd. # libcom_err must be built before libpam. # libcrypt must be built before libpam. # libkvm must be built before libdevstat. # msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, and libtacplus. # ncurses must be built before libdialog, libedit and libreadline. # libnetgraph must be built before libbsnmp/modules/snmp_netgraph. # libopie must be built before libpam. # libradius must be built before libpam. # librpcsvc must be built before libpam. # libsbuf must be built before libcam. # libtacplus must be built before libpam. # libutil must be built before libpam. # libypclnt must be built before libpam. # libgssapi must be built before librpcsec_gss # # Otherwise, the SUBDIR list should be in alphabetical order. # # Except it appears bind needs to be compiled last SUBDIR_ORDERED= ${_csu} \ libc \ libbsm \ libauditd \ libcom_err \ libcrypt \ libelf \ libkvm \ msun \ libmd \ ncurses \ ${_libnetgraph} \ libradius \ librpcsvc \ libsbuf \ libtacplus \ libutil \ ${_libypclnt} SUBDIR= ${SUBDIR_ORDERED} \ libalias \ libarchive \ ${_libatm} \ libbegemot \ ${_libbluetooth} \ ${_libbsnmp} \ libbz2 \ libcalendar \ libcam \ libcompat \ libdevinfo \ libdevstat \ libdisk \ libdwarf \ libedit \ libexpat \ libfetch \ libftpio \ libgeom \ ${_libgpib} \ ${_libgssapi} \ ${_librpcsec_gss} \ libipsec \ ${_libipx} \ libjail \ libkiconv \ liblzma \ libmagic \ libmemstat \ ${_libmilter} \ ${_libmp} \ ${_libncp} \ ${_libngatm} \ libopie \ libpam \ libpcap \ ${_libpmc} \ ${_libproc} \ librt \ ${_librtld_db} \ ${_libsdp} \ ${_libsm} \ ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ libstand \ libstdbuf \ ${_libtelnet} \ ${_libthr} \ libthread_db \ libufs \ libugidfw \ ${_libusbhid} \ ${_libusb} \ ${_libvgl} \ libwrap \ liby \ libz \ ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf .elif exists(${.CURDIR}/csu/${MACHINE_ARCH}/Makefile) _csu=csu/${MACHINE_ARCH} .else _csu=csu .endif # NB: keep these sorted by MK_* knobs .if ${MK_ATM} != "no" _libngatm= libngatm .endif .if ${MK_BIND} != "no" _bind= bind .endif .if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp .endif .if ${MK_BSNMP} != "no" _libbsnmp= libbsnmp .endif .if ${MK_GPIB} != "no" _libgpib= libgpib .endif .if ${MK_GSSAPI} != "no" _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss .endif .if ${MK_IPX} != "no" _libipx= libipx .endif .if ${MK_LIBTHR} != "no" _libthr= libthr .endif .if ${MK_NETGRAPH} != "no" _libnetgraph= libnetgraph .endif .if ${MK_NIS} != "no" _libypclnt= libypclnt .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" .if ${MK_NCP} != "no" _libncp= libncp .endif _libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db .endif .if ${MACHINE_ARCH} == "ia64" _libsmb= libsmb .endif .if ${MACHINE_ARCH} == "powerpc" _libsmb= libsmb .endif .if ${MK_OPENSSL} != "no" _libmp= libmp .endif .if ${MK_PMC} != "no" _libpmc= libpmc .endif .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm _libsmdb= libsmdb _libsmutil= libsmutil .endif .if ${MK_TELNET} != "no" _libtelnet= libtelnet .endif .if ${MK_USB} != "no" _libusbhid= libusbhid _libusb= libusb .endif +.if !make(install) +SUBDIR_PARALLEL= +.endif + .include Property changes on: stable/8/lib/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/Makefile:r263778 Index: stable/8/lib =================================================================== --- stable/8/lib (revision 264302) +++ stable/8/lib (revision 264303) Property changes on: stable/8/lib ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib:r263778 Index: stable/8/sbin/Makefile =================================================================== --- stable/8/sbin/Makefile (revision 264302) +++ stable/8/sbin/Makefile (revision 264303) @@ -1,157 +1,159 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # $FreeBSD$ .include # XXX MISSING: icheck ncheck SUBDIR= adjkerntz \ atacontrol \ ${_atm} \ badsect \ ${_bsdlabel} \ camcontrol \ ccdconfig \ clri \ comcontrol \ conscontrol \ ddb \ ${_devd} \ devfs \ dhclient \ dmesg \ dump \ dumpfs \ dumpon \ ${_fdisk} \ ${_fdisk_pc98} \ ffsinfo \ fsck \ fsck_ffs \ fsck_msdosfs \ fsdb \ fsirand \ gbde \ geom \ ggate \ growfs \ gvinum \ hastctl \ hastd \ ifconfig \ init \ ${_ipf} \ ${_ipfw} \ iscontrol \ kldconfig \ kldload \ kldstat \ kldunload \ ldconfig \ ${_mca} \ md5 \ mdconfig \ mdmfs \ mknod \ mksnap_ffs \ mount \ mount_cd9660 \ mount_msdosfs \ mount_nfs \ mount_ntfs \ mount_nullfs \ mount_udf \ mount_unionfs \ ${_natd} \ newfs \ newfs_msdos \ nfsiod \ nos-tun \ ${_pfctl} \ ${_pflogd} \ ping \ ${_ping6} \ ${_quotacheck} \ rcorder \ reboot \ recoverdisk \ restore \ route \ ${_routed} \ ${_rtsol} \ savecore \ ${_sconfig} \ setkey \ shutdown \ spppcontrol \ ${_sunlabel} \ swapon \ sysctl \ tunefs \ umount \ .if ${MK_ATM} != "no" _atm= atm .endif .if ${MK_CXX} != "no" _devd= devd .endif .if ${MK_IPFILTER} != "no" _ipf= ipf .endif .if ${MK_IPFW} != "no" _ipfw= ipfw _natd= natd .endif .if ${MK_PF} != "no" _pfctl= pfctl _pflogd= pflogd .endif .if ${MK_INET6} != "no" _ping6= ping6 _rtsol= rtsol .endif .if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" _bsdlabel= bsdlabel .endif .if ${MK_QUOTAS} != "no" _quotacheck= quotacheck .endif .if ${MK_ROUTED} != "no" _routed= routed .endif .if ${MACHINE_ARCH} == "i386" .if ${MACHINE} == "i386" _fdisk= fdisk .elif ${MACHINE} == "pc98" _fdisk_pc98= fdisk_pc98 .endif _sconfig= sconfig .endif .if ${MACHINE_ARCH} == "amd64" _fdisk= fdisk .endif .if ${MACHINE_ARCH} == "arm" _fdisk= fdisk .endif .if ${MACHINE_ARCH} == "ia64" _mca= mca .endif .if ${MACHINE_ARCH} == "sparc64" _sunlabel= sunlabel .endif +SUBDIR_PARALLEL= + .include Index: stable/8/sbin =================================================================== --- stable/8/sbin (revision 264302) +++ stable/8/sbin (revision 264303) Property changes on: stable/8/sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin:r263778 Index: stable/8/share/mk/bsd.subdir.mk =================================================================== --- stable/8/share/mk/bsd.subdir.mk (revision 264302) +++ stable/8/share/mk/bsd.subdir.mk (revision 264303) @@ -1,95 +1,114 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # $FreeBSD$ # # The include file contains the default targets # for building subdirectories. # # For all of the directories listed in the variable SUBDIRS, the # specified directory will be visited and the target made. There is # also a default target which allows the command "make subdir" where # subdir is any directory listed in the variable SUBDIRS. # # # +++ variables +++ # # DISTRIBUTION Name of distribution. [base] # # SUBDIR A list of subdirectories that should be built as well. # Each of the targets will execute the same target in the # subdirectories. # # +++ targets +++ # # distribute: # This is a variant of install, which will # put the stuff into the right "distribution". # # afterinstall, all, all-man, beforeinstall, checkdpadd, # clean, cleandepend, cleandir, depend, install, lint, maninstall, # manlint, obj, objlink, realinstall, regress, tags # .include DISTRIBUTION?= base .if !target(distribute) distribute: .for dist in ${DISTRIBUTION} ${_+_}cd ${.CURDIR}; \ ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies .endfor .endif _SUBDIR: .USE .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR) @${_+_}set -e; for entry in ${SUBDIR}; do \ if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH} (${.TARGET:realinstall=install})"; \ edir=$${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ else \ ${ECHODIR} "===> ${DIRPRFX}$$entry (${.TARGET:realinstall=install})"; \ edir=$${entry}; \ cd ${.CURDIR}/$${edir}; \ fi; \ ${MAKE} ${.TARGET:realinstall=install} \ DIRPRFX=${DIRPRFX}$$edir/; \ done .endif ${SUBDIR}: .PHONY ${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \ cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \ else \ cd ${.CURDIR}/${.TARGET}; \ fi; \ ${MAKE} all .for __target in all all-man checkdpadd clean cleandepend cleandir \ depend distribute lint maninstall manlint \ obj objlink realinstall regress tags \ ${SUBDIR_TARGETS} +.ifdef SUBDIR_PARALLEL +.for __dir in ${SUBDIR} +${__target}: ${__target}_subdir_${__dir} +${__target}_subdir_${__dir}: .MAKE + @${_+_}set -e; \ + if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \ + ${ECHODIR} "===> ${DIRPRFX}${__dir}.${MACHINE_ARCH} (${__target:realinstall=install})"; \ + edir=${__dir}.${MACHINE_ARCH}; \ + cd ${.CURDIR}/$${edir}; \ + else \ + ${ECHODIR} "===> ${DIRPRFX}${__dir} (${__target:realinstall=install})"; \ + edir=${__dir}; \ + cd ${.CURDIR}/$${edir}; \ + fi; \ + ${MAKE} ${__target:realinstall=install} \ + DIRPRFX=${DIRPRFX}$$edir/ +.endfor +.else ${__target}: _SUBDIR +.endif .endfor .for __target in files includes .for __stage in build install ${__stage}${__target}: .if make(${__stage}${__target}) ${__stage}${__target}: _SUBDIR .endif .endfor ${__target}: ${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target} .endfor .if !target(install) .if !target(beforeinstall) beforeinstall: .endif .if !target(afterinstall) afterinstall: .endif install: beforeinstall realinstall afterinstall .ORDER: beforeinstall realinstall afterinstall .endif Index: stable/8/share/mk =================================================================== --- stable/8/share/mk (revision 264302) +++ stable/8/share/mk (revision 264303) Property changes on: stable/8/share/mk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/mk:r263778 Index: stable/8/share =================================================================== --- stable/8/share (revision 264302) +++ stable/8/share (revision 264303) Property changes on: stable/8/share ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share:r263778 Index: stable/8/usr.bin/Makefile =================================================================== --- stable/8/usr.bin/Makefile (revision 264302) +++ stable/8/usr.bin/Makefile (revision 264303) @@ -1,396 +1,398 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD$ .include # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend # XXX Use GNU versions: apropos bc dc diff grep ld man patch whatis # Moved to secure: bdes # SUBDIR= alias \ apply \ ${_ar} \ asa \ ${_at} \ ${_atm} \ awk \ banner \ basename \ ${_biff} \ ${_bluetooth} \ brandelf \ bsdiff \ bzip2 \ bzip2recover \ ${_c89} \ ${_c99} \ ${_calendar} \ cap_mkdb \ ${_catman} \ chat \ ${_checknr} \ ${_chkey} \ chpass \ cksum \ cmp \ col \ ${_colcrt} \ colldef \ colrm \ column \ comm \ ${_compile_et} \ compress \ ${_cpio} \ cpuset \ csplit \ ${_csup} \ ${_ctags} \ cut \ ${_dig} \ dirname \ du \ ee \ elf2aout \ elfdump \ enigma \ env \ expand \ false \ fetch \ file \ ${_file2c} \ find \ finger \ fmt \ fold \ ${_from} \ fstat \ fsync \ ftp \ gcore \ gencat \ getconf \ getent \ getopt \ ${_gprof} \ gzip \ head \ ${_hesinfo} \ hexdump \ ${_host} \ id \ ${_indent} \ ipcrm \ ipcs \ join \ jot \ kdump \ keylogin \ keylogout \ killall \ ktrace \ ktrdump \ lam \ last \ lastcomm \ ldd \ leave \ less \ lessecho \ lesskey \ ${_lex} \ limits \ locale \ ${_locate} \ lock \ lockf \ logger \ login \ logins \ logname \ look \ lorder \ lsvfs \ lzmainfo \ m4 \ ${_mail} \ ${_make} \ ${_makewhatis} \ mesg \ minigzip \ ministat \ mkdep \ mkfifo \ mklocale \ ${_mkstr} \ mktemp \ mkuzip \ ${_msgs} \ mt \ ${_nc} \ ncal \ ${_ncplist} \ ${_ncplogin} \ netstat \ newgrp \ ${_newkey} \ nfsstat \ nice \ nl \ nohup \ ${_nslookup} \ ${_nsupdate} \ opieinfo \ opiekey \ opiepasswd \ pagesize \ passwd \ paste \ pathchk \ perror \ pr \ printenv \ printf \ procstat \ ${_quota} \ renice \ rev \ revoke \ ${_rlogin} \ ${_rpcgen} \ rpcinfo \ rs \ ${_rsh} \ rup \ ${_ruptime} \ rusers \ rwall \ ${_rwho} \ script \ sed \ shar \ showmount \ ${_smbutil} \ sockstat \ split \ stat \ stdbuf \ su \ systat \ tabs \ tail \ talk \ tar \ tcopy \ tee \ ${_telnet} \ tftp \ time \ tip \ top \ touch \ tput \ tr \ true \ truncate \ ${_truss} \ tset \ tsort \ tty \ ${_ul} \ uname \ unexpand \ ${_unifdef} \ uniq \ unzip \ units \ unvis \ ${_usbhidaction} \ ${_usbhidctl} \ users \ uudecode \ uuencode \ ${_vacation} \ ${_vgrind} \ vi \ vis \ vmstat \ w \ wall \ wc \ what \ whereis \ which \ who \ whois \ write \ xargs \ xinstall \ ${_xlint} \ ${_xstr} \ xz \ xzdec \ ${_yacc} \ yes \ ${_ypcat} \ ${_ypmatch} \ ${_ypwhich} .if ${MACHINE_ARCH} != "arm" _truss= truss .endif # NB: keep these sorted by MK_* knobs .if ${MK_AT} != "no" _at= at .endif .if ${MK_ATM} != "no" _atm= atm .endif .if ${MK_MAN_UTILS} != "no" _catman= catman .endif .if ${MK_BIND_UTILS} != "no" _dig= dig _host= host _nslookup= nslookup _nsupdate= nsupdate .endif .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth .endif .if ${MK_BSD_CPIO} != "no" _cpio= cpio .endif .if ${MK_CALENDAR} != "no" _calendar= calendar .endif .if ${MK_HESIOD} != "no" _hesinfo= hesinfo .endif .if ${MK_OPENSSL} != "no" _chkey= chkey _newkey= newkey .endif .if ${MK_LIBTHR} != "no" _csup= csup .endif .if ${MK_LOCATE} != "no" _locate= locate .endif # XXX msgs? .if ${MK_MAIL} != "no" _biff= biff _from= from _mail= mail _msgs= msgs .endif .if ${MK_MAKE} != "no" _make= make .endif .if ${MK_MAN_UTILS} != "no" _makewhatis= makewhatis .endif .if ${MK_NETCAT} != "no" _nc= nc .endif .if ${MK_NIS} != "no" _ypcat= ypcat _ypmatch= ypmatch _ypwhich= ypwhich .endif .if ${MK_QUOTAS} != "no" _quota= quota .endif .if ${MK_RCMDS} != "no" _rlogin= rlogin _rsh= rsh _ruptime= ruptime _rwho= rwho .endif .if ${MK_SENDMAIL} != "no" _vacation= vacation .endif .if ${MK_TELNET} != "no" _telnet= telnet .endif .if ${MK_TEXTPROC} != "no" _checknr= checknr _colcrt= colcrt _ul= ul .endif .if ${MK_TOOLCHAIN} != "no" _ar= ar _c89= c89 _c99= c99 _compile_et= compile_et _ctags= ctags _file2c= file2c _gprof= gprof _indent= indent _lex= lex _mkstr= mkstr _rpcgen= rpcgen _unifdef= unifdef _xlint= xlint _xstr= xstr # XXX maybe under textproc? _vgrind= vgrind _yacc= yacc .endif .if ${MK_USB} != "no" _usbhidaction= usbhidaction _usbhidctl= usbhidctl .endif .if ${MACHINE_ARCH} == "i386" .if ${MK_NCP} != "no" _ncplist= ncplist _ncplogin= ncplogin .endif _smbutil= smbutil .endif .if ${MACHINE_ARCH} == "ia64" _smbutil= smbutil .endif .if ${MACHINE_ARCH} == "amd64" .if ${MK_NCP} != "no" _ncplist= ncplist _ncplogin= ncplogin .endif _smbutil= smbutil .endif .if ${MACHINE_ARCH} == "powerpc" _smbutil= smbutil .endif +SUBDIR_PARALLEL= + .include Index: stable/8/usr.bin =================================================================== --- stable/8/usr.bin (revision 264302) +++ stable/8/usr.bin (revision 264303) Property changes on: stable/8/usr.bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin:r263778,263833 Index: stable/8/usr.sbin/Makefile =================================================================== --- stable/8/usr.sbin/Makefile (revision 264302) +++ stable/8/usr.sbin/Makefile (revision 264303) @@ -1,523 +1,525 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 # $FreeBSD$ .include # XXX MISSING: mkproto SUBDIR= ${_ac} \ ${_accton} \ ${_acpi} \ adduser \ ${_amd} \ ${_ancontrol} \ ${_apm} \ ${_apmd} \ arp \ ${_asf} \ ${_atm} \ ${_audit} \ ${_auditd} \ ${_auditreduce} \ ${_authpf} \ ${_bluetooth} \ ${_boot0cfg} \ ${_boot98cfg} \ bootparamd \ ${_bsnmpd} \ ${_btxld} \ burncd \ cdcontrol \ chkgrp \ chown \ chroot \ ckdist \ clear_locks \ ${_config} \ ${_cpucontrol} \ crashinfo \ cron \ ${_crunch} \ ${_ctm} \ daemon \ dconschat \ devinfo \ digictl \ diskinfo \ dumpcis \ ${_editmap} \ ${_edquota} \ ${_eeprom} \ extattr \ extattrctl \ ${_faithd} \ ${_fdcontrol} \ ${_fdformat} \ ${_fdread} \ ${_fdwrite} \ fifolog \ ${_flowctl} \ ${_freebsd-update} \ ${_ftp-proxy} \ fwcontrol \ getfmac \ getpmac \ gstat \ ${_gssd} \ i2c \ ifmcstat \ inetd \ iostat \ ${_ip6addrctl} \ ${_ipfwpcap} \ ${_IPXrouted} \ ${_jail} \ ${_jexec} \ ${_jls} \ ${_kbdcontrol} \ ${_kbdmap} \ ${_keyserv} \ ${_kgmon} \ ${_kgzip} \ kldxref \ lastlogin \ ${_lmcconfig} \ ${_lpr} \ ${_lptcontrol} \ ${_mailstats} \ mailwrapper \ makefs \ ${_makemap} \ ${_manctl} \ memcontrol \ mergemaster \ mfiutil \ mixer \ ${_mld6query} \ mlxcontrol \ mountd \ ${_mount_nwfs} \ mount_portalfs \ ${_mount_smbfs} \ ${_moused} \ ${_mptable} \ mptutil \ mtest \ mtree \ ${_ndiscvt} \ ${_ndp} \ newsyslog \ nfscbd \ nfsd \ nfsdumpstate \ nfsrevoke \ nfsuserd \ ${_ngctl} \ ${_nghook} \ nologin \ ${_nscd} \ ${_ntp} \ ${_nvram} \ ${_ofwdump} \ pciconf \ periodic \ ${_pkg_install} \ ${_pmcannotate} \ ${_pmccontrol} \ ${_pmcstat} \ ${_pnpinfo} \ ${_portsnap} \ powerd \ ${_ppp} \ ${_pppctl} \ ${_praliases} \ ${_praudit} \ procctl \ pstat \ pw \ pwd_mkdb \ quot \ ${_quotaon} \ rarpd \ ${_repquota} \ ${_rip6query} \ rmt \ ${_route6d} \ rpcbind \ rpc.lockd \ rpc.statd \ rpc.umntall \ ${_rpc.yppasswdd} \ ${_rpc.ypupdated} \ ${_rpc.ypxfrd} \ ${_rrenumd} \ ${_rtadvctl} \ ${_rtadvd} \ rtprio \ ${_rtsold} \ ${_rwhod} \ ${_sa} \ ${_sade} \ ${_sendmail} \ service \ services_mkdb \ setfib \ setfmac \ setpmac \ ${_sicontrol} \ smbmsg \ snapinfo \ ${_spkrtest} \ spray \ ${_sysinstall} \ syslogd \ tcpdchk \ tcpdmatch \ tcpdrop \ tcpdump \ timed \ traceroute \ ${_traceroute6} \ trpt \ tzsetup \ ${_uathload} \ ugidfw \ ${_uhsoctl} \ ${_usbdevs} \ ${_usbdump} \ ${_usbconfig} \ ${_vidcontrol} \ vipw \ wake \ watch \ watchdogd \ ${_wlandebug} \ ${_wlconfig} \ ${_wpa} \ ${_ypbind} \ ${_yp_mkdb} \ ${_yppoll} \ ${_yppush} \ ${_ypserv} \ ${_ypset} \ zic \ ${_zzz} # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" _ac= ac _accton= accton _sa= sa .endif .if ${MK_AMD} != "no" _amd= amd .endif .if ${MK_AUDIT} != "no" _audit= audit _auditd= auditd _auditreduce= auditreduce _praudit= praudit .endif .if ${MK_AUTHPF} != "no" _authpf= authpf .endif .if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no" SUBDIR+= dnssec-dsfromkey SUBDIR+= dnssec-keyfromlabel SUBDIR+= dnssec-keygen SUBDIR+= dnssec-revoke SUBDIR+= dnssec-settime SUBDIR+= dnssec-signzone .endif .if ${MK_BIND_NAMED} != "no" SUBDIR+= arpaname SUBDIR+= ddns-confgen SUBDIR+= genrandom SUBDIR+= isc-hmac-fixup SUBDIR+= named SUBDIR+= named-checkconf SUBDIR+= named-checkzone SUBDIR+= named-journalprint SUBDIR+= named.reload SUBDIR+= nsec3hash SUBDIR+= rndc SUBDIR+= rndc-confgen .endif .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth .endif .if ${MK_BSNMP} != "no" _bsnmpd= bsnmpd .endif .if ${MK_CTM} != "no" _ctm= ctm .endif .if ${MK_FLOPPY} != "no" _fdcontrol= fdcontrol _fdformat= fdformat _fdread= fdread _fdwrite= fdwrite .endif .if ${MK_FREEBSD_UPDATE} != "no" _freebsd-update= freebsd-update .endif .if ${MK_GSSAPI} != no _gssd= gssd .endif .if ${MK_INET6} != "no" _faithd= faithd _ip6addrctl= ip6addrctl _mld6query= mld6query _ndp= ndp _rip6query= rip6query _route6d= route6d _rrenumd= rrenumd _rtadvctl= rtadvctl _rtadvd= rtadvd _rtsold= rtsold _traceroute6= traceroute6 .endif .if ${MK_IPFW} != "no" _ipfwpcap= ipfwpcap .endif .if ${MK_IPX} != "no" _IPXrouted= IPXrouted .endif .if ${MK_JAIL} != "no" _jail= jail _jexec= jexec _jls= jls .endif # XXX MK_SYSCONS # XXX is moused w/ usb useful? .if ${MK_LEGACY_CONSOLE} != "no" _kbdcontrol= kbdcontrol _kbdmap= kbdmap _moused= moused _vidcontrol= vidcontrol .endif .if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" .if ${MK_PPP} != "no" _pppctl= pppctl .endif .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif .endif .if ${MK_LPR} != "no" _lpr= lpr .endif .if ${MK_MAN_UTILS} != "no" _manctl= manctl .endif .if ${MK_NETGRAPH} != "no" _flowctl= flowctl _lmcconfig= lmcconfig _ngctl= ngctl _nghook= nghook .endif .if ${MK_NIS} != "no" _rpc.yppasswdd= rpc.yppasswdd _rpc.ypupdated= rpc.ypupdated _rpc.ypxfrd= rpc.ypxfrd _ypbind= ypbind _yp_mkdb= yp_mkdb _yppoll= yppoll _yppush= yppush _ypserv= ypserv _ypset= ypset .endif .if ${MK_NTP} != "no" _ntp= ntp .endif .if ${MK_OPENSSL} != "no" _keyserv= keyserv .endif .if ${MK_PF} != "no" _ftp-proxy= ftp-proxy .endif .if ${MK_PKGTOOLS} != "no" _pkg_install= pkg_install SUBDIR+= pkg .endif # XXX MK_TOOLCHAIN? .if ${MK_PMC} != "no" _pmcannotate= pmcannotate _pmccontrol= pmccontrol _pmcstat= pmcstat .endif .if ${MK_PORTSNAP} != "no" _portsnap= portsnap .endif .if ${MK_PPP} != "no" _ppp= ppp #_pppctl handled below .endif .if ${MK_QUOTAS} != "no" _edquota= edquota _quotaon= quotaon _repquota= repquota .endif .if ${MK_RCMDS} != "no" _rwhod= rwhod .endif .if ${MK_SENDMAIL} != "no" _editmap= editmap _mailstats= mailstats _makemap= makemap _praliases= praliases _sendmail= sendmail .endif .if ${MK_SYSINSTALL} != "no" .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "sparc64" _sade= sade .endif .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" _sysinstall= sysinstall .endif .endif .if ${MK_TOOLCHAIN} != "no" _config= config _crunch= crunch .endif .if ${MK_USB} != "no" .if ${MACHINE_ARCH} != "ia64" _uathload= uathload .endif _uhsoctl= uhsoctl #_usbdevs= usbdevs _usbdump= usbdump _usbconfig= usbconfig .endif .if ${MK_WIRELESS} != "no" _ancontrol= ancontrol _wlandebug= wlandebug _wpa= wpa .endif .if ${MACHINE_ARCH} == "arm" _kgmon= kgmon .endif .if ${MACHINE_ARCH} == "i386" .if ${MK_APM} != "no" _apm= apm _apmd= apmd .endif _asf= asf .if ${MK_TOOLCHAIN} != "no" _btxld= btxld .endif _cpucontrol= cpucontrol _kgmon= kgmon _kgzip= kgzip _lptcontrol= lptcontrol .if ${MK_NCP} != "no" _mount_nwfs= mount_nwfs .endif _mount_smbfs= mount_smbfs _mptable= mptable .if ${MK_NDIS} != "no" _ndiscvt= ndiscvt .endif _pnpinfo= pnpinfo _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz .if ${MACHINE} == "i386" .if ${MK_ACPI} != "no" _acpi= acpi .endif _boot0cfg= boot0cfg .if ${MK_WIRELESS} != "no" _wlconfig= wlconfig .endif .elif ${MACHINE} == "pc98" _boot98cfg= boot98cfg .endif .endif # kgzip: builds, but missing support files # mptable: broken (not 64 bit clean) # pnpinfo: crashes (not really useful anyway) .if ${MACHINE_ARCH} == "amd64" .if ${MK_ACPI} != "no" _acpi= acpi .endif _asf= asf _boot0cfg= boot0cfg .if ${MK_TOOLCHAIN} != "no" _btxld= btxld .endif _cpucontrol= cpucontrol _kgmon= kgmon _lptcontrol= lptcontrol .if ${MK_NCP} != "no" _mount_nwfs= mount_nwfs .endif _mount_smbfs= mount_smbfs _mptable= mptable .if ${MK_NDIS} != "no" _ndiscvt= ndiscvt .endif _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz .endif .if ${MACHINE_ARCH} == "ia64" .if ${MK_ACPI} != "no" _acpi= acpi .endif _kgmon= kgmon _mount_smbfs= mount_smbfs _zzz= zzz .endif .if ${MACHINE_ARCH} == "powerpc" _mount_smbfs= mount_smbfs _nvram= nvram _ofwdump= ofwdump .endif .if ${MACHINE_ARCH} == "sparc64" _eeprom= eeprom _ofwdump= ofwdump .endif +SUBDIR_PARALLEL= + .include Property changes on: stable/8/usr.sbin/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/Makefile:r263778 Index: stable/8/usr.sbin =================================================================== --- stable/8/usr.sbin (revision 264302) +++ stable/8/usr.sbin (revision 264303) Property changes on: stable/8/usr.sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin:r263778 Index: stable/9/bin/Makefile =================================================================== --- stable/9/bin/Makefile (revision 264302) +++ stable/9/bin/Makefile (revision 264303) @@ -1,58 +1,60 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ .include SUBDIR= cat \ chflags \ chio \ chmod \ cp \ date \ dd \ df \ domainname \ echo \ ed \ expr \ getfacl \ hostname \ kenv \ kill \ ln \ ls \ mkdir \ mv \ pax \ pkill \ ps \ pwait \ pwd \ realpath \ rm \ rmdir \ setfacl \ sh \ sleep \ stty \ sync \ test \ uuidgen .if ${MK_RCMDS} != "no" SUBDIR+= rcp .endif .if ${MK_SENDMAIL} != "no" SUBDIR+= rmail .endif .if ${MK_TCSH} != "no" SUBDIR+= csh .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Index: stable/9/bin =================================================================== --- stable/9/bin (revision 264302) +++ stable/9/bin (revision 264303) Property changes on: stable/9/bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin:r263778 Index: stable/9/gnu/usr.bin/Makefile =================================================================== --- stable/9/gnu/usr.bin/Makefile (revision 264302) +++ stable/9/gnu/usr.bin/Makefile (revision 264303) @@ -1,56 +1,58 @@ # $FreeBSD$ .include SUBDIR= ${_binutils} \ ${_cc} \ ${_cvs} \ dialog \ diff \ diff3 \ ${_dtc} \ ${_gdb} \ ${_gperf} \ grep \ ${_groff} \ patch \ ${_rcs} \ sdiff \ send-pr \ sort \ ${_texinfo} .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" _groff= groff .endif .endif .if ${MK_CVS} != "no" _cvs= cvs .endif .if ${MK_FDT} != "no" _dtc= dtc .endif .if ${MK_INFO} != "no" _texinfo= texinfo .endif .if ${MK_RCS} != "no" _rcs= rcs .endif .if ${MK_BINUTILS} != "no" _binutils= binutils .endif .if ${MK_GCC} != "no" _cc= cc .endif .if ${MK_GDB} != "no" _gdb= gdb .endif +SUBDIR_PARALLEL= + .include Index: stable/9/lib/Makefile =================================================================== --- stable/9/lib/Makefile (revision 264302) +++ stable/9/lib/Makefile (revision 264303) @@ -1,243 +1,247 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ .include # To satisfy shared library or ELF linkage when only the libraries being # built are visible: # # csu must be built before all shared libaries for ELF. # libc must be built before all other shared libraries. # libbsm must be built before ibauditd. # libcom_err must be built before libpam. # libcrypt must be built before libpam. # libkvm must be built before libdevstat. # msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, and libtacplus. # ncurses must be built before libdialog, libedit and libreadline. # libnetgraph must be built before libbsnmp/modules/snmp_netgraph. # libopie must be built before libpam. # libradius must be built before libpam. # librpcsvc must be built before libpam. # libsbuf must be built before libcam. # libtacplus must be built before libpam. # libutil must be built before libpam. # libypclnt must be built before libpam. # libgssapi must be built before librpcsec_gss # # Otherwise, the SUBDIR list should be in alphabetical order. # # Except it appears bind needs to be compiled last SUBDIR_ORDERED= ${_csu} \ libc \ libbsm \ libauditd \ libcom_err \ libcompiler_rt \ libcrypt \ libelf \ ${_libiconv_modules} \ libkvm \ msun \ libmd \ ncurses \ ${_libnetgraph} \ libradius \ librpcsvc \ libsbuf \ libtacplus \ libutil \ ${_libypclnt} \ ${_libcxxrt} \ ${_libcplusplus} SUBDIR= ${SUBDIR_ORDERED} \ libalias \ libarchive \ ${_libatm} \ libbegemot \ libblocksruntime \ ${_libbluetooth} \ ${_libbsnmp} \ libbz2 \ libcalendar \ libcam \ libcompat \ libdevinfo \ libdevstat \ libdisk \ libdwarf \ libedit \ ${_libefi} \ libexpat \ libfetch \ libftpio \ libgeom \ ${_libgpib} \ ${_libgssapi} \ ${_librpcsec_gss} \ libipsec \ ${_libipx} \ libjail \ libkiconv \ liblzma \ libmagic \ libmemstat \ ${_libmilter} \ ${_libmp} \ ${_libncp} \ libnetbsd \ ${_libngatm} \ libopie \ libpam \ libpcap \ ${_libpmc} \ ${_libproc} \ libprocstat \ librt \ ${_librtld_db} \ ${_libsdp} \ ${_libsm} \ ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ libstand \ libstdbuf \ ${_libtelnet} \ ${_libthr} \ libthread_db \ libucl \ libufs \ libugidfw \ libulog \ ${_libusbhid} \ ${_libusb} \ ${_libvgl} \ libwrap \ liby \ libz \ ${_bind} \ ${_clang} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf .elif exists(${.CURDIR}/csu/${MACHINE_ARCH}) _csu=csu/${MACHINE_ARCH} .elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}/Makefile) _csu=csu/${MACHINE_CPUARCH} .else _csu=csu .endif # NB: keep these sorted by MK_* knobs .if ${MK_ATM} != "no" _libngatm= libngatm .endif .if ${MK_BIND} != "no" _bind= bind .endif .if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp .endif .if ${MK_BSNMP} != "no" _libbsnmp= libbsnmp .endif .if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif .if ${MK_GPIB} != "no" _libgpib= libgpib .endif .if ${MK_GSSAPI} != "no" _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss .endif .if ${MK_ICONV} != "no" _libiconv_modules= libiconv_modules .endif .if ${MK_IPX} != "no" _libipx= libipx .endif .if ${MK_LIBCPLUSPLUS} != "no" _libcxxrt= libcxxrt _libcplusplus= libc++ .endif .if ${MK_LIBTHR} != "no" _libthr= libthr .endif .if ${MK_NETGRAPH} != "no" _libnetgraph= libnetgraph .endif .if ${MK_NIS} != "no" _libypclnt= libypclnt .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" .if ${MK_NCP} != "no" _libncp= libncp .endif _libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db .endif .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi _libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "amd64" .if ${MK_NCP} != "no" _libncp= libncp .endif .endif .if ${MACHINE_CPUARCH} == "powerpc" _libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "sparc64" _libsmb= libsmb .endif .if ${MK_OPENSSL} != "no" _libmp= libmp .endif .if ${MK_PMC} != "no" _libpmc= libpmc .endif .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm _libsmdb= libsmdb _libsmutil= libsmutil .endif .if ${MK_TELNET} != "no" _libtelnet= libtelnet .endif .if ${MK_USB} != "no" _libusbhid= libusbhid _libusb= libusb .endif +.if !make(install) +SUBDIR_PARALLEL= +.endif + .include Property changes on: stable/9/lib/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/Makefile:r263778 Index: stable/9/lib/clang/Makefile =================================================================== --- stable/9/lib/clang/Makefile (revision 264302) +++ stable/9/lib/clang/Makefile (revision 264303) @@ -1,104 +1,106 @@ # $FreeBSD$ .include .if !make(install) .if !defined(EARLY_BUILD) && defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no" _libclangstaticanalyzer= \ libclangstaticanalyzercheckers \ libclangstaticanalyzercore \ libclangstaticanalyzerfrontend _libclangarcmigrate= \ libclangarcmigrate _libclangrewriter= \ libclangrewritecore \ libclangrewritefrontend .endif # !EARLY_BUILD && MK_CLANG_FULL SUBDIR= libclanganalysis \ ${_libclangarcmigrate} \ libclangast \ libclangbasic \ libclangcodegen \ libclangdriver \ libclangedit \ libclangfrontend \ libclangfrontendtool \ libclanglex \ libclangparse \ ${_libclangrewriter} \ libclangsema \ libclangserialization \ ${_libclangstaticanalyzer} \ \ libllvmanalysis \ libllvmasmparser \ libllvmasmprinter \ libllvmbitreader \ libllvmbitwriter \ libllvmcodegen \ libllvmcore \ libllvminstcombine \ libllvminstrumentation \ libllvmipa \ libllvmipo \ libllvmirreader \ libllvmlinker \ libllvmmc \ libllvmmcparser \ libllvmobjcarcopts \ libllvmobject \ libllvmoption \ libllvmscalaropts \ libllvmselectiondag \ libllvmsupport \ libllvmtablegen \ libllvmtarget \ libllvmtransformutils \ libllvmvectorize \ \ libllvmarmasmparser \ libllvmarmcodegen \ libllvmarmdesc \ libllvmarmdisassembler \ libllvmarminfo \ libllvmarminstprinter \ libllvmmipsasmparser \ libllvmmipscodegen \ libllvmmipsdesc \ libllvmmipsdisassembler \ libllvmmipsinfo \ libllvmmipsinstprinter \ libllvmpowerpcasmparser \ libllvmpowerpccodegen \ libllvmpowerpcdesc \ libllvmpowerpcinfo \ libllvmpowerpcinstprinter \ libllvmsparcasmparser \ libllvmsparccodegen \ libllvmsparcdesc \ libllvmsparcdisassembler \ libllvmsparcinfo \ libllvmsparcinstprinter \ libllvmx86asmparser \ libllvmx86codegen \ libllvmx86desc \ libllvmx86disassembler \ libllvmx86info \ libllvmx86instprinter \ libllvmx86utils .if ${MK_CLANG_EXTRAS} != "no" SUBDIR+=libllvmdebuginfo \ libllvmexecutionengine \ libllvminterpreter \ libllvmjit \ libllvmmcdisassembler \ libllvmmcjit \ libllvmruntimedyld .endif # MK_CLANG_EXTRAS .endif # !make(install) SUBDIR+= include +SUBDIR_PARALLEL= + .include Index: stable/9/lib/clang =================================================================== --- stable/9/lib/clang (revision 264302) +++ stable/9/lib/clang (revision 264303) Property changes on: stable/9/lib/clang ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/clang:r263778 Index: stable/9/lib =================================================================== --- stable/9/lib (revision 264302) +++ stable/9/lib (revision 264303) Property changes on: stable/9/lib ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib:r263778 Index: stable/9/sbin/Makefile =================================================================== --- stable/9/sbin/Makefile (revision 264302) +++ stable/9/sbin/Makefile (revision 264303) @@ -1,116 +1,118 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # $FreeBSD$ .include # XXX MISSING: icheck ncheck SUBDIR=adjkerntz \ atacontrol \ badsect \ camcontrol \ ccdconfig \ clri \ comcontrol \ conscontrol \ ddb \ devfs \ dhclient \ dmesg \ dump \ dumpfs \ dumpon \ ffsinfo \ fsck \ fsck_ffs \ fsck_msdosfs \ fsdb \ fsirand \ gbde \ geom \ ggate \ growfs \ gvinum \ hastctl \ hastd \ ifconfig \ init \ iscontrol \ kldconfig \ kldload \ kldstat \ kldunload \ ldconfig \ md5 \ mdconfig \ mdmfs \ mknod \ mksnap_ffs \ mount \ mount_cd9660 \ mount_msdosfs \ mount_nfs \ mount_ntfs \ mount_nullfs \ mount_udf \ mount_unionfs \ newfs \ newfs_msdos \ nfsiod \ nos-tun \ ping \ rcorder \ reboot \ recoverdisk \ resolvconf \ restore \ route \ savecore \ setkey \ shutdown \ spppcontrol \ swapon \ sysctl \ tunefs \ umount \ .if ${MK_ATM} != "no" SUBDIR+= atm .endif .if ${MK_CXX} != "no" SUBDIR+= devd .endif .if ${MK_IPFILTER} != "no" SUBDIR+= ipf .endif .if ${MK_IPFW} != "no" SUBDIR+= ipfw SUBDIR+= natd .endif .if ${MK_PF} != "no" SUBDIR+= pfctl SUBDIR+= pflogd .endif .if ${MK_INET6} != "no" SUBDIR+= ping6 SUBDIR+= rtsol .endif .if ${MK_QUOTAS} != "no" SUBDIR+= quotacheck .endif .if ${MK_ROUTED} != "no" SUBDIR+= routed .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Index: stable/9/sbin =================================================================== --- stable/9/sbin (revision 264302) +++ stable/9/sbin (revision 264303) Property changes on: stable/9/sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin:r263778 Index: stable/9/share/mk/bsd.subdir.mk =================================================================== --- stable/9/share/mk/bsd.subdir.mk (revision 264302) +++ stable/9/share/mk/bsd.subdir.mk (revision 264303) @@ -1,94 +1,113 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # $FreeBSD$ # # The include file contains the default targets # for building subdirectories. # # For all of the directories listed in the variable SUBDIRS, the # specified directory will be visited and the target made. There is # also a default target which allows the command "make subdir" where # subdir is any directory listed in the variable SUBDIRS. # # # +++ variables +++ # # DISTRIBUTION Name of distribution. [base] # # SUBDIR A list of subdirectories that should be built as well. # Each of the targets will execute the same target in the # subdirectories. # # +++ targets +++ # # distribute: # This is a variant of install, which will # put the stuff into the right "distribution". # # afterinstall, all, all-man, beforeinstall, checkdpadd, clean, # cleandepend, cleandir, cleanilinks depend, install, lint, # maninstall, manlint, obj, objlink, realinstall, regress, tags # .include DISTRIBUTION?= base .if !target(distribute) distribute: .for dist in ${DISTRIBUTION} ${_+_}cd ${.CURDIR}; \ ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies .endfor .endif _SUBDIR: .USE .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR) @${_+_}set -e; for entry in ${SUBDIR}; do \ if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH} (${.TARGET:realinstall=install})"; \ edir=$${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ else \ ${ECHODIR} "===> ${DIRPRFX}$$entry (${.TARGET:realinstall=install})"; \ edir=$${entry}; \ cd ${.CURDIR}/$${edir}; \ fi; \ ${MAKE} ${.TARGET:realinstall=install} \ DIRPRFX=${DIRPRFX}$$edir/; \ done .endif ${SUBDIR}: .PHONY ${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \ cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \ else \ cd ${.CURDIR}/${.TARGET}; \ fi; \ ${MAKE} all .for __target in all all-man checkdpadd clean cleandepend cleandir \ cleanilinks depend distribute lint maninstall manlint obj objlink \ realinstall regress tags ${SUBDIR_TARGETS} +.ifdef SUBDIR_PARALLEL +.for __dir in ${SUBDIR} +${__target}: ${__target}_subdir_${__dir} +${__target}_subdir_${__dir}: .MAKE + @${_+_}set -e; \ + if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \ + ${ECHODIR} "===> ${DIRPRFX}${__dir}.${MACHINE_ARCH} (${__target:realinstall=install})"; \ + edir=${__dir}.${MACHINE_ARCH}; \ + cd ${.CURDIR}/$${edir}; \ + else \ + ${ECHODIR} "===> ${DIRPRFX}${__dir} (${__target:realinstall=install})"; \ + edir=${__dir}; \ + cd ${.CURDIR}/$${edir}; \ + fi; \ + ${MAKE} ${__target:realinstall=install} \ + DIRPRFX=${DIRPRFX}$$edir/ +.endfor +.else ${__target}: _SUBDIR +.endif .endfor .for __target in files includes .for __stage in build install ${__stage}${__target}: .if make(${__stage}${__target}) ${__stage}${__target}: _SUBDIR .endif .endfor ${__target}: ${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target} .endfor .if !target(install) .if !target(beforeinstall) beforeinstall: .endif .if !target(afterinstall) afterinstall: .endif install: beforeinstall realinstall afterinstall .ORDER: beforeinstall realinstall afterinstall .endif Index: stable/9/share/mk =================================================================== --- stable/9/share/mk (revision 264302) +++ stable/9/share/mk (revision 264303) Property changes on: stable/9/share/mk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/mk:r263778 Index: stable/9/share =================================================================== --- stable/9/share (revision 264302) +++ stable/9/share (revision 264303) Property changes on: stable/9/share ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share:r263778 Index: stable/9/usr.bin/Makefile =================================================================== --- stable/9/usr.bin/Makefile (revision 264302) +++ stable/9/usr.bin/Makefile (revision 264303) @@ -1,354 +1,356 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD$ .include # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend # XXX Use GNU versions: diff ld patch # Moved to secure: bdes # SUBDIR= alias \ apply \ asa \ awk \ banner \ basename \ brandelf \ bsdiff \ bzip2 \ bzip2recover \ cap_mkdb \ chat \ chpass \ cksum \ ${_clang} \ cmp \ col \ colldef \ colrm \ column \ comm \ compress \ cpuset \ csplit \ ctlstat \ cut \ dirname \ du \ ee \ elf2aout \ elfdump \ enigma \ env \ expand \ false \ fetch \ file \ find \ finger \ fmt \ fold \ fstat \ fsync \ ftp \ gcore \ gencat \ getconf \ getent \ getopt \ grep \ gzip \ head \ hexdump \ ${_iconv} \ id \ ipcrm \ ipcs \ join \ jot \ kdump \ keylogin \ keylogout \ killall \ ktrace \ ktrdump \ lam \ lastcomm \ ldd \ leave \ less \ lessecho \ lesskey \ limits \ locale \ lock \ lockf \ logger \ login \ logins \ logname \ look \ lorder \ lsvfs \ lzmainfo \ m4 \ ${_makewhatis} \ ${_man} \ mesg \ minigzip \ ministat \ ${_mkcsmapper} \ mkdep \ ${_mkesdb} \ mkfifo \ mklocale \ mktemp \ mkulzma \ mkuzip \ mt \ ncal \ netstat \ newgrp \ nfsstat \ nice \ nl \ nohup \ opieinfo \ opiekey \ opiepasswd \ pagesize \ passwd \ paste \ pathchk \ perror \ pr \ printenv \ printf \ procstat \ protect \ rctl \ renice \ rev \ revoke \ rpcinfo \ rs \ rup \ rusers \ rwall \ script \ sed \ seq \ shar \ showmount \ sockstat \ split \ stat \ stdbuf \ su \ systat \ tabs \ tail \ talk \ tar \ tcopy \ tee \ tftp \ time \ tip \ top \ touch \ tput \ tr \ true \ truncate \ truss \ tset \ tsort \ tty \ uname \ unexpand \ uniq \ unzip \ units \ unvis \ uudecode \ uuencode \ vi \ vis \ vmstat \ w \ wall \ wc \ what \ whereis \ which \ whois \ write \ xargs \ xinstall \ ${_xlint} \ ${_xstr} \ xz \ xzdec \ ${_yacc} \ yes \ ${_ypcat} \ ${_ypmatch} \ ${_ypwhich} # NB: keep these sorted by MK_* knobs .if ${MK_AT} != "no" SUBDIR+= at .endif .if ${MK_ATM} != "no" SUBDIR+= atm .endif .if ${MK_MAN_UTILS} != "no" SUBDIR+= catman .endif .if ${MK_BIND_UTILS} != "no" SUBDIR+= dig SUBDIR+= host SUBDIR+= nslookup SUBDIR+= nsupdate .endif .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif .if ${MK_BSD_CPIO} != "no" SUBDIR+= cpio .endif .if ${MK_CALENDAR} != "no" SUBDIR+= calendar .endif .if ${MK_CLANG} != "no" _clang= clang .endif .if ${MK_HESIOD} != "no" SUBDIR+= hesinfo .endif .if ${MK_ICONV} != "no" _iconv= iconv _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif .if ${MK_GROFF} != "no" SUBDIR+= vgrind .endif .if ${MK_OPENSSL} != "no" SUBDIR+= bc SUBDIR+= chkey SUBDIR+= dc SUBDIR+= newkey .endif .if ${MK_LIBTHR} != "no" SUBDIR+= csup .endif .if ${MK_LOCATE} != "no" SUBDIR+= locate .endif # XXX msgs? .if ${MK_MAIL} != "no" SUBDIR+= biff SUBDIR+= from SUBDIR+= mail SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" SUBDIR+= bmake SUBDIR+= make .endif .if ${MK_MAN_UTILS} != "no" _makewhatis= makewhatis _man= man .endif .if ${MK_NETCAT} != "no" SUBDIR+= nc .endif .if ${MK_NIS} != "no" SUBDIR+= ypcat SUBDIR+= ypmatch SUBDIR+= ypwhich .endif .if ${MK_QUOTAS} != "no" SUBDIR+= quota .endif .if ${MK_RCMDS} != "no" SUBDIR+= rlogin SUBDIR+= rsh SUBDIR+= ruptime SUBDIR+= rwho .endif .if ${MK_SENDMAIL} != "no" SUBDIR+= vacation .endif .if ${MK_TELNET} != "no" SUBDIR+= telnet .endif .if ${MK_TEXTPROC} != "no" SUBDIR+= checknr SUBDIR+= colcrt SUBDIR+= ul .endif .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 SUBDIR+= c99 SUBDIR+= compile_et SUBDIR+= ctags SUBDIR+= file2c SUBDIR+= gprof SUBDIR+= indent SUBDIR+= lex SUBDIR+= mkstr SUBDIR+= rpcgen SUBDIR+= unifdef SUBDIR+= xlint SUBDIR+= xstr SUBDIR+= yacc .endif .if ${MK_USB} != "no" SUBDIR+= usbhidaction SUBDIR+= usbhidctl .endif .if ${MK_UTMPX} != "no" SUBDIR+= last SUBDIR+= users SUBDIR+= who SUBDIR+= wtmpcvt .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Index: stable/9/usr.bin/clang/Makefile =================================================================== --- stable/9/usr.bin/clang/Makefile (revision 264302) +++ stable/9/usr.bin/clang/Makefile (revision 264303) @@ -1,26 +1,28 @@ # $FreeBSD$ .include SUBDIR= clang clang-tblgen tblgen .if ${MK_CLANG_EXTRAS} != "no" && !defined(TOOLS_PREFIX) SUBDIR+=bugpoint \ llc \ lli \ llvm-ar \ llvm-as \ llvm-bcanalyzer \ llvm-diff \ llvm-dis \ llvm-extract \ llvm-link \ llvm-mc \ llvm-nm \ llvm-objdump \ llvm-rtdyld \ macho-dump \ opt .endif +SUBDIR_PARALLEL= + .include Index: stable/9/usr.bin/clang =================================================================== --- stable/9/usr.bin/clang (revision 264302) +++ stable/9/usr.bin/clang (revision 264303) Property changes on: stable/9/usr.bin/clang ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/clang:r263833 Index: stable/9/usr.bin =================================================================== --- stable/9/usr.bin (revision 264302) +++ stable/9/usr.bin (revision 264303) Property changes on: stable/9/usr.bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin:r263778,263833 Index: stable/9/usr.sbin/Makefile =================================================================== --- stable/9/usr.sbin/Makefile (revision 264302) +++ stable/9/usr.sbin/Makefile (revision 264303) @@ -1,338 +1,340 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 # $FreeBSD$ .include SUBDIR= adduser \ arp \ bootparamd \ burncd \ bsdconfig \ bsdinstall \ cdcontrol \ chkgrp \ chown \ chroot \ ckdist \ clear_locks \ crashinfo \ cron \ ctladm \ daemon \ dconschat \ devinfo \ digictl \ diskinfo \ dumpcis \ etcupdate \ extattr \ extattrctl \ fifolog \ fwcontrol \ getfmac \ getpmac \ gstat \ i2c \ ifmcstat \ inetd \ iostat \ kldxref \ mailwrapper \ makefs \ memcontrol \ mergemaster \ mfiutil \ mixer \ mlxcontrol \ mountd \ mount_portalfs \ mptutil \ mtest \ mtree \ newsyslog \ nfscbd \ nfsd \ nfsdumpstate \ nfsrevoke \ nfsuserd \ nmtree \ nologin \ ${_pc_sysinstall} \ pciconf \ periodic \ powerd \ procctl \ pstat \ pw \ pwd_mkdb \ quot \ rarpd \ rmt \ rpcbind \ rpc.lockd \ rpc.statd \ rpc.umntall \ rtprio \ service \ services_mkdb \ setfib \ setfmac \ setpmac \ smbmsg \ snapinfo \ spray \ syslogd \ sysrc \ tcpdchk \ tcpdmatch \ tcpdrop \ tcpdump \ timed \ traceroute \ trpt \ tzsetup \ ugidfw \ vipw \ wake \ watch \ watchdogd \ zic # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" SUBDIR+= accton SUBDIR+= sa .endif .if ${MK_AMD} != "no" SUBDIR+= amd .endif .if ${MK_AUDIT} != "no" SUBDIR+= audit SUBDIR+= auditd .if ${MK_OPENSSL} != "no" SUBDIR+= auditdistd .endif SUBDIR+= auditreduce SUBDIR+= praudit .endif .if ${MK_AUTHPF} != "no" SUBDIR+= authpf .endif .if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no" SUBDIR+= dnssec-dsfromkey SUBDIR+= dnssec-keyfromlabel SUBDIR+= dnssec-keygen SUBDIR+= dnssec-revoke SUBDIR+= dnssec-settime SUBDIR+= dnssec-signzone SUBDIR+= dnssec-verify .endif .if ${MK_BIND_NAMED} != "no" SUBDIR+= arpaname SUBDIR+= ddns-confgen SUBDIR+= genrandom SUBDIR+= isc-hmac-fixup SUBDIR+= named SUBDIR+= named-checkconf SUBDIR+= named-checkzone SUBDIR+= named-journalprint SUBDIR+= nsec3hash SUBDIR+= rndc SUBDIR+= rndc-confgen .endif .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif .if ${MK_BSNMP} != "no" SUBDIR+= bsnmpd .endif .if ${MK_CTM} != "no" SUBDIR+= ctm .endif .if ${MK_FLOPPY} != "no" SUBDIR+= fdcontrol SUBDIR+= fdformat SUBDIR+= fdread SUBDIR+= fdwrite .endif .if ${MK_FREEBSD_UPDATE} != "no" SUBDIR+= freebsd-update .endif .if ${MK_GSSAPI} != "no" SUBDIR+= gssd .endif .if ${MK_GPIO} != "no" SUBDIR+= gpioctl .endif .if ${MK_INET6} != "no" SUBDIR+= faithd SUBDIR+= ip6addrctl SUBDIR+= mld6query SUBDIR+= ndp SUBDIR+= rip6query SUBDIR+= route6d SUBDIR+= rrenumd SUBDIR+= rtadvctl SUBDIR+= rtadvd SUBDIR+= rtsold SUBDIR+= traceroute6 .endif .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif .if ${MK_IPX} != "no" SUBDIR+= IPXrouted .endif .if ${MK_JAIL} != "no" SUBDIR+= jail SUBDIR+= jexec SUBDIR+= jls .endif # XXX MK_SYSCONS .if ${MK_LEGACY_CONSOLE} != "no" SUBDIR+= kbdcontrol SUBDIR+= kbdmap SUBDIR+= moused SUBDIR+= vidcontrol .endif .if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" .if ${MK_PPP} != "no" SUBDIR+= pppctl .endif .if ${MK_NS_CACHING} != "no" SUBDIR+= nscd .endif .endif .if ${MK_LPR} != "no" SUBDIR+= lpr .endif .if ${MK_MAN_UTILS} != "no" SUBDIR+= manctl .endif .if ${MK_NETGRAPH} != "no" SUBDIR+= flowctl SUBDIR+= lmcconfig SUBDIR+= ngctl SUBDIR+= nghook .endif .if ${MK_NIS} != "no" SUBDIR+= rpc.yppasswdd SUBDIR+= rpc.ypupdated SUBDIR+= rpc.ypxfrd SUBDIR+= ypbind SUBDIR+= yp_mkdb SUBDIR+= yppoll SUBDIR+= yppush SUBDIR+= ypserv SUBDIR+= ypset .endif .if ${MK_NTP} != "no" SUBDIR+= ntp .endif .if ${MK_OPENSSL} != "no" SUBDIR+= keyserv .endif .if ${MK_PC_SYSINSTALL} != "no" _pc_sysinstall= pc-sysinstall .endif .if ${MK_PF} != "no" SUBDIR+= ftp-proxy .endif .if ${MK_PKGTOOLS} != "no" SUBDIR+= pkg_install SUBDIR+= pkg .endif # XXX MK_TOOLCHAIN? .if ${MK_PMC} != "no" SUBDIR+= pmcannotate SUBDIR+= pmccontrol SUBDIR+= pmcstat .endif .if ${MK_PORTSNAP} != "no" SUBDIR+= portsnap .endif .if ${MK_PPP} != "no" SUBDIR+= ppp .endif .if ${MK_QUOTAS} != "no" SUBDIR+= edquota SUBDIR+= quotaon SUBDIR+= repquota .endif .if ${MK_RCMDS} != "no" SUBDIR+= rwhod .endif .if ${MK_SENDMAIL} != "no" SUBDIR+= editmap SUBDIR+= mailstats SUBDIR+= makemap SUBDIR+= praliases SUBDIR+= sendmail .endif .if ${MK_SYSINSTALL} != "no" SUBDIR+= sysinstall .endif .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch .endif .if ${MK_USB} != "no" SUBDIR+= uathload SUBDIR+= uhsoctl SUBDIR+= usbconfig SUBDIR+= usbdump .endif .if ${MK_UTMPX} != "no" SUBDIR+= ac SUBDIR+= lastlogin SUBDIR+= utxrm .endif .if ${MK_WIRELESS} != "no" SUBDIR+= ancontrol SUBDIR+= wlandebug SUBDIR+= wpa .endif .include SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include Property changes on: stable/9/usr.sbin/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/Makefile:r263778 Index: stable/9/usr.sbin =================================================================== --- stable/9/usr.sbin (revision 264302) +++ stable/9/usr.sbin (revision 264303) Property changes on: stable/9/usr.sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin:r263778