diff options
-rw-r--r-- | bin/Makefile | 13 | ||||
-rw-r--r-- | libexec/Makefile | 18 | ||||
-rw-r--r-- | sbin/Makefile | 61 | ||||
-rw-r--r-- | usr.bin/Makefile | 98 | ||||
-rw-r--r-- | usr.sbin/Makefile | 235 |
5 files changed, 259 insertions, 166 deletions
diff --git a/bin/Makefile b/bin/Makefile index 6a5d8c5..86998bd 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -6,6 +6,7 @@ SUBDIR= cat \ chio \ chmod \ cp \ + ${_csh} \ date \ dd \ df \ @@ -24,8 +25,10 @@ SUBDIR= cat \ pax \ ps \ pwd \ + ${_rcp} \ realpath \ rm \ + ${_rmail} \ rmdir \ setfacl \ sh \ @@ -35,15 +38,15 @@ SUBDIR= cat \ test .if !defined(NO_RCMNDS) -SUBDIR+=rcp +_rcp= rcp .endif -.if !defined(NO_TCSH) -SUBDIR+=csh +.if !defined(NO_SENDMAIL) +_rmail= rmail .endif -.if !defined(NO_SENDMAIL) -SUBDIR+=rmail +.if !defined(NO_TCSH) +_csh= csh .endif .include <bsd.subdir.mk> diff --git a/libexec/Makefile b/libexec/Makefile index c4c3c13..af28d3a 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -8,8 +8,11 @@ SUBDIR= atrun \ ftpd \ getNAME \ getty \ + ${_lukemftpd} \ + ${_mail.local} \ makekey \ mknetid \ + ${_named-xfer} \ pppoed \ pt_chown \ rbootd \ @@ -22,27 +25,30 @@ SUBDIR= atrun \ rpc.rwalld \ rpc.sprayd \ rshd \ + ${_rtld-elf} \ save-entropy \ + ${_smrsh} \ talkd \ tcpd \ telnetd \ tftpd \ ypxfr -.if !defined(NOPIC) -SUBDIR+=rtld-elf +.if !defined(NO_BIND) +_named-xfer= named-xfer .endif -.if !defined(NO_BIND) -SUBDIR+=named-xfer +.if !defined(NOPIC) +_rtld-elf= rtld-elf .endif .if !defined(NO_SENDMAIL) -SUBDIR+=mail.local smrsh +_mail.local= mail.local +_smrsh= smrsh .endif .if defined(WANT_LUKEMFTPD) -SUBDIR+=lukemftpd +_lukemftpd= lukemftpd .endif .include <bsd.subdir.mk> diff --git a/sbin/Makefile b/sbin/Makefile index 58b004b..443b89c 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -5,6 +5,7 @@ SUBDIR= adjkerntz \ atacontrol \ + ${_atm} \ badsect \ bsdlabel \ camcontrol \ @@ -12,12 +13,15 @@ SUBDIR= adjkerntz \ clri \ comcontrol \ conscontrol \ + ${_devd} \ devfs \ dhclient \ dmesg \ dump \ dumpfs \ dumpon \ + ${_fdisk} \ + ${_fdisk_pc98} \ ffsinfo \ fsck \ fsck_ffs \ @@ -25,15 +29,23 @@ SUBDIR= adjkerntz \ fsdb \ fsirand \ gbde \ + ${_gpt} \ growfs \ ifconfig \ init \ + ${_ip6fw} \ + ${_ipf} \ + ${_ipfs} \ + ${_ipfstat} \ ipfw \ + ${_ipmon} \ + ${_ipnat} \ kldconfig \ kldload \ kldstat \ kldunload \ ldconfig \ + ${_mca} \ md5 \ mdconfig \ mdmfs \ @@ -58,6 +70,7 @@ SUBDIR= adjkerntz \ nologin \ nos-tun \ ping \ + ${_ping6} \ quotacheck \ raidctl \ rcorder \ @@ -67,6 +80,7 @@ SUBDIR= adjkerntz \ routed \ rtsol \ savecore \ + ${_sconfig} \ shutdown \ slattach \ spppcontrol \ @@ -75,51 +89,52 @@ SUBDIR= adjkerntz \ swapon \ sysctl \ tunefs \ - umount + umount \ + ${_vinum} .if !defined(NOATM) -SUBDIR+=atm +_atm= atm .endif .if !defined(NO_CXX) -SUBDIR+=devd +_devd= devd .endif .if !defined(NO_IPFILTER) -SUBDIR+=ipf \ - ipfs \ - ipfstat \ - ipmon \ - ipnat +_ipf= ipf +_ipfs= ipfs +_ipfstat= ipfstat +_ipmon= ipmon +_ipnat= ipnat .endif .if !defined(NOINET6) -SUBDIR+=ip6fw \ - ping6 +_ip6fw= ip6fw +_ping6= ping6 .endif .if !defined(NO_VINUM) -SUBDIR+=vinum +_vinum= vinum .endif .if ${MACHINE_ARCH} == "i386" -SUBDIR+=sconfig -.if ${MACHINE} == "pc98" -SUBDIR+=fdisk_pc98 -.else -SUBDIR+=fdisk +.if ${MACHINE} == "i386" +_fdisk= fdisk +.elif ${MACHINE} == "pc98" +_fdisk_pc98= fdisk_pc98 .endif +_sconfig= sconfig .endif -.if ${MACHINE_ARCH} == "ia64" -SUBDIR+=fdisk \ - gpt \ - mca +.if ${MACHINE_ARCH} == "amd64" +_fdisk= fdisk +_gpt= gpt .endif -.if ${MACHINE_ARCH} == "amd64" -SUBDIR+=fdisk \ - gpt +.if ${MACHINE_ARCH} == "ia64" +_fdisk= fdisk +_gpt= gpt +_mca= mca .endif .include <bsd.subdir.mk> diff --git a/usr.bin/Makefile b/usr.bin/Makefile index c8e64c4..1d2e3cc 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -7,25 +7,6 @@ # Moved to secure: bdes # -.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "amd64" -.if !defined(NO_TOOLCHAIN) -_gprof= gprof -.endif -_truss= truss -.endif - -.if !defined(NO_TOOLCHAIN) -_c89= c89 -_c99= c99 -_lex= lex -_xlint= xlint -_yacc= yacc -.endif - -.if !defined(NOATM) -_atm= atm -.endif - SUBDIR= alias \ apply \ asa \ @@ -35,6 +16,7 @@ SUBDIR= alias \ banner \ basename \ biff \ + ${_bluetooth} \ brandelf \ bzip2 \ bzip2recover \ @@ -45,6 +27,7 @@ SUBDIR= alias \ catman \ chat \ checknr \ + ${_chkey} \ chpass \ cksum \ cmp \ @@ -59,7 +42,11 @@ SUBDIR= alias \ csplit \ ctags \ cut \ + ${_dig} \ dirname \ + ${_dnskeygen} \ + ${_dnsquery} \ + ${_doscmd} \ du \ ee \ elf2aout \ @@ -87,6 +74,7 @@ SUBDIR= alias \ head \ hesinfo \ hexdump \ + ${_host} \ id \ indent \ ipcrm \ @@ -133,8 +121,11 @@ SUBDIR= alias \ msgs \ mt \ ncal \ + ${_ncplist} \ + ${_ncplogin} \ netstat \ newgrp \ + ${_newkey} \ nfsstat \ nice \ nl \ @@ -163,10 +154,12 @@ SUBDIR= alias \ rusers \ rwall \ rwho \ + ${_sasc} \ script \ sed \ shar \ showmount \ + ${_smbutil} \ sockstat \ split \ stat \ @@ -191,6 +184,7 @@ SUBDIR= alias \ tset \ tsort \ tty \ + ${_uac} \ ul \ uname \ unexpand \ @@ -198,10 +192,13 @@ SUBDIR= alias \ uniq \ units \ unvis \ + ${_usbhidaction} \ + ${_usbhidctl} \ users \ uudecode \ uuencode \ uuidgen \ + ${_vacation} \ vgrind \ vi \ vis \ @@ -226,44 +223,63 @@ SUBDIR= alias \ ypmatch \ ypwhich +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc" +_truss= truss +.endif + +.if !defined(NOATM) +_atm= atm +.endif + .if !defined(NO_BIND) -SUBDIR+=dig \ - dnskeygen \ - dnsquery \ - host +_dig= dig +_dnskeygen= dnskeygen +_dnsquery= dnsquery +_host= host +.endif + +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +_chkey= chkey +_newkey= newkey .endif .if !defined(NO_SENDMAIL) -SUBDIR+=vacation +_vacation= vacation +.endif + +.if !defined(NO_TOOLCHAIN) +_c89= c89 +_c99= c99 +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc" +_gprof= gprof +.endif +_lex= lex +_xlint= xlint +_yacc= yacc .endif .if !defined(NO_USB) -SUBDIR+=usbhidaction \ - usbhidctl +_usbhidaction= usbhidaction +_usbhidctl= usbhidctl .endif .if ${MACHINE_ARCH} == "i386" -# Things that don't compile on alpha or are aout specific: -SUBDIR+=bluetooth \ - doscmd \ - ncplist \ - ncplogin \ - sasc \ - smbutil +_bluetooth= bluetooth +_doscmd= doscmd +_ncplist= ncplist +_ncplogin= ncplogin +_sasc= sasc +_smbutil= smbutil .endif .if ${MACHINE_ARCH} == "alpha" -SUBDIR+=uac +_uac= uac .endif .if ${MACHINE_ARCH} == "amd64" -SUBDIR+=ncplist \ - ncplogin \ - smbutil -.endif - -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -SUBDIR+=chkey newkey +_ncplist= ncplist +_ncplogin= ncplogin +_smbutil= smbutil .endif .include <bsd.subdir.mk> diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 7d038ad..66f595d 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,20 +1,25 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 # $FreeBSD$ -.if ${MACHINE_ARCH} != "powerpc" -_sysinstall=sysinstall -.endif - # XXX MISSING: mkproto SUBDIR= IPXrouted \ ac \ accton \ + ${_acpi} \ adduser \ amd \ ancontrol \ + ${_apm} \ + ${_apmd} \ arp \ + ${_asf} \ + ${_atm} \ + ${_bluetooth} \ + ${_boot0cfg} \ + ${_boot98cfg} \ bootparamd \ bsnmpd \ + ${_btxld} \ burncd \ cdcontrol \ chkgrp \ @@ -30,7 +35,9 @@ SUBDIR= IPXrouted \ devinfo \ digictl \ diskinfo \ + ${_editmap} \ edquota \ + ${_elf2exe} \ extattr \ extattrctl \ faithd \ @@ -42,42 +49,72 @@ SUBDIR= IPXrouted \ getfmac \ getpmac \ gstat \ + ${_i4b} \ ifmcstat \ inetd \ iostat \ ip6addrctl \ + ${_ipftest} \ + ${_ipresend} \ + ${_ipsend} \ + ${_iptest} \ jail \ jexec \ jls \ kbdcontrol \ kbdmap \ kernbb \ + ${_keyserv} \ + ${_kgmon} \ + ${_kgzip} \ kldxref \ lastlogin \ + ${_lpr} \ + ${_lptcontrol} \ + ${_mailstats} \ mailwrapper \ + ${_makemap} \ manctl \ memcontrol \ mergemaster \ mixer \ + ${_mld6query} \ mlxcontrol \ - mount_portalfs \ mountd \ + ${_mount_nwfs} \ + mount_portalfs \ + ${_mount_smbfs} \ moused \ + ${_mptable} \ mrouted \ mtest \ mtree \ + ${_named} \ + ${_named.reload} \ + ${_named.restart} \ + ${_ndc} \ + ${_ndiscvt} \ ndp \ newsyslog \ nfsd \ ngctl \ - ntp \ nghook \ + ${_nslookup} \ + ${_nsupdate} \ + ntp \ + ${_ofwdump} \ + ${_pccard} \ pciconf \ + ${_pcvt/ispcvt} \ + ${_pcvt} \ periodic \ pkg_install \ + ${_pnpinfo} \ ppp \ + ${_pppctl} \ pppd \ pppstats \ + ${_praliases} \ procctl \ pstat \ pw \ @@ -87,7 +124,9 @@ SUBDIR= IPXrouted \ rarpd \ raycontrol \ repquota \ + ${_rip6query} \ rmt \ + ${_route6d} \ rpcbind \ rpc.lockd \ rpc.statd \ @@ -101,12 +140,17 @@ SUBDIR= IPXrouted \ rtsold \ rwhod \ sa \ + ${_sendmail} \ setfmac \ setkey \ setpmac \ + ${_sgsc} \ + ${_sicontrol} \ sliplogin \ slstat \ + ${_spkrtest} \ spray \ + ${_stallion} \ ${_sysinstall} \ syslogd \ tcpdchk \ @@ -114,111 +158,123 @@ SUBDIR= IPXrouted \ tcpdump \ timed \ traceroute \ + ${_traceroute6} \ trpt \ tzsetup \ ugidfw \ + ${_usbd} \ + ${_usbdevs} \ vidcontrol \ vipw \ vnconfig \ watch \ watchdogd \ wicontrol \ - yp_mkdb \ + ${_wlconfig} \ ypbind \ + yp_mkdb \ yppoll \ yppush \ ypserv \ ypset \ - zic + zic \ + ${_zzz} + +.if ${MACHINE_ARCH} != "powerpc" +_sysinstall= sysinstall +.endif .if !defined(NOATM) -SUBDIR+=atm +_atm= atm .endif -.if !defined(NOINET6) -SUBDIR+=mld6query \ - rip6query \ - route6d \ - traceroute6 +.if !defined(NO_BIND) +_named= named +_named.reload= named.reload +_named.restart= named.restart +_ndc= ndc +_nslookup= nslookup +_nsupdate= nsupdate .endif -.if !defined(NO_IPFILTER) -SUBDIR+=ipftest \ - ipresend \ - ipsend \ - iptest +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +_keyserv= keyserv .endif -.if !defined(NO_USB) -SUBDIR+=usbd \ - usbdevs +.if !defined(NOINET6) +_mld6query= mld6query +_rip6query= rip6query +_route6d= route6d +_traceroute6= traceroute6 .endif -.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "powerpc" -SUBDIR+=pppctl + +.if !defined(NO_IPFILTER) +_ipftest= ipftest +_ipresend= ipresend +_ipsend= ipsend +_iptest= iptest .endif -.if !defined(NO_BIND) -SUBDIR+=named \ - named.reload \ - named.restart \ - ndc \ - nslookup \ - nsupdate +.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "powerpc" +_pppctl= pppctl .endif .if !defined(NO_LPR) -SUBDIR+=lpr +_lpr= lpr .endif .if !defined(NO_SENDMAIL) -SUBDIR+=editmap \ - mailstats \ - makemap \ - praliases \ - sendmail +_editmap= editmap +_mailstats= mailstats +_makemap= makemap +_praliases= praliases +_sendmail= sendmail .endif -.if ${MACHINE_ARCH} == "alpha" -SUBDIR+=elf2exe \ - pnpinfo +.if !defined(NO_USB) +_usbd= usbd +_usbdevs= usbdevs .endif .if ${MACHINE_ARCH} == "i386" -SUBDIR+=apm \ - apmd \ - asf \ - bluetooth \ - btxld \ - kgmon \ - kgzip \ - lptcontrol \ - mount_nwfs \ - mount_smbfs \ - mptable \ - ndiscvt \ - pccard \ - pcvt \ - pnpinfo \ - sgsc \ - sicontrol \ - spkrtest \ - stallion \ - wlconfig \ - zzz - .if !defined(NO_ACPI) -SUBDIR+=acpi +_acpi= acpi .endif - +_apm= apm +_apmd= apmd +_asf= asf +_bluetooth= bluetooth +.if ${MACHINE} == "i386" +_boot0cfg= boot0cfg +.endif +.if ${MACHINE} == "pc98" +_boot98cfg= boot98cfg +.endif +_btxld= btxld .if !defined(NO_I4B) -SUBDIR+=i4b +_i4b= i4b .endif - +_kgmon= kgmon +_kgzip= kgzip +_lptcontrol= lptcontrol +_mount_nwfs= mount_nwfs +_mount_smbfs= mount_smbfs +_mptable= mptable +_ndiscvt= ndiscvt +_pccard= pccard +_pcvt= pcvt +_pnpinfo= pnpinfo +_sgsc= sgsc +_sicontrol= sicontrol +_spkrtest= spkrtest +_stallion= stallion +_wlconfig= wlconfig +_zzz= zzz .endif -.if ${MACHINE_ARCH} == "ia64" -SUBDIR+=acpi \ - zzz +.if ${MACHINE_ARCH} == "alpha" +_elf2exe= elf2exe +_pnpinfo= pnpinfo .endif # kgmon: builds, but no kernel profiling @@ -226,34 +282,31 @@ SUBDIR+=acpi \ # mptable: broken (not 64 bit clean) # pnpinfo: crashes (not really useful anyway) .if ${MACHINE_ARCH} == "amd64" -SUBDIR+=acpi \ - asf \ - boot0cfg \ - btxld \ - lptcontrol \ - mount_nwfs \ - mount_smbfs \ - mptable \ - pcvt/ispcvt \ - sicontrol \ - spkrtest \ - zzz +.if !defined(NO_ACPI) +_acpi= acpi .endif - -.if ${MACHINE} == "i386" -SUBDIR+=boot0cfg +_asf= asf +_boot0cfg= boot0cfg +_btxld= btxld +_lptcontrol= lptcontrol +_mount_nwfs= mount_nwfs +_mount_smbfs= mount_smbfs +_mptable= mptable +_pcvt/ispcvt= pcvt/ispcvt +_sicontrol= sicontrol +_spkrtest= spkrtest +_zzz= zzz .endif -.if ${MACHINE} == "pc98" -SUBDIR+=boot98cfg +.if ${MACHINE_ARCH} == "ia64" +.if !defined(NO_ACPI) +_acpi= acpi .endif - -.if ${MACHINE_ARCH} == "sparc64" -SUBDIR+=ofwdump +_zzz= zzz .endif -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -SUBDIR+=keyserv +.if ${MACHINE_ARCH} == "sparc64" +_ofwdump= ofwdump .endif .include <bsd.subdir.mk> |