Author: imp
Date: Mon Sep 13 02:25:21 2010
New Revision: 212527
URL: http://svn.freebsd.org/changeset/base/212527
Log:
MF tbemd: Move to using Makefile.arch to select what to build.
Reviewed by: arch@ (no objection)
Added:
head/sbin/Makefile.amd64 (contents, props changed)
head/sbin/Makefile.arm (contents, props changed)
head/sbin/Makefile.i386 (contents, props changed)
head/sbin/Makefile.ia64 (contents, props changed)
head/sbin/Makefile.mips (contents, props changed)
head/sbin/Makefile.pc98 (contents, props changed)
head/sbin/Makefile.sparc64 (contents, props changed)
Modified:
head/sbin/Makefile
Modified: head/sbin/Makefile
==============================================================================
--- head/sbin/Makefile Mon Sep 13 02:23:03 2010 (r212526)
+++ head/sbin/Makefile Mon Sep 13 02:25:21 2010 (r212527)
@@ -5,26 +5,21 @@
# XXX MISSING: icheck ncheck
-SUBDIR= adjkerntz \
+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 \
@@ -40,15 +35,12 @@ SUBDIR= adjkerntz \
hastd \
ifconfig \
init \
- ${_ipf} \
- ${_ipfw} \
iscontrol \
kldconfig \
kldload \
kldstat \
kldunload \
ldconfig \
- ${_mca} \
md5 \
mdconfig \
mdmfs \
@@ -62,96 +54,62 @@ SUBDIR= adjkerntz \
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
+SUBDIR+= atm
.endif
.if ${MK_CXX} != "no"
-_devd= devd
+SUBDIR+= devd
.endif
.if ${MK_IPFILTER} != "no"
-_ipf= ipf
+SUBDIR+= ipf
.endif
.if ${MK_IPFW} != "no"
-_ipfw= ipfw
-_natd= natd
+SUBDIR+= ipfw
+SUBDIR+= natd
.endif
.if ${MK_PF} != "no"
-_pfctl= pfctl
-_pflogd= pflogd
+SUBDIR+= pfctl
+SUBDIR+= pflogd
.endif
.if ${MK_INET6} != "no"
-_ping6= ping6
-_rtsol= rtsol
-.endif
-
-.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc"
-_bsdlabel= bsdlabel
+SUBDIR+= ping6
+SUBDIR+= rtsol
.endif
.if ${MK_QUOTAS} != "no"
-_quotacheck= quotacheck
+SUBDIR+= 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
+SUBDIR+= routed
.endif
-.if ${MACHINE_ARCH} == "amd64"
-_fdisk= fdisk
-.endif
+.include <bsd.arch.inc.mk>
-.if ${MACHINE_ARCH} == "arm"
-_fdisk= fdisk
-.endif
-
-.if ${MACHINE_ARCH} == "ia64"
-_mca= mca
-.endif
-
-.if ${MACHINE_ARCH} == "sparc64"
-_sunlabel= sunlabel
-.endif
+SUBDIR:= ${SUBDIR:O}
.include <bsd.subdir.mk>
Added: head/sbin/Makefile.amd64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/Makefile.amd64 Mon Sep 13 02:25:21 2010 (r212527)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SUBDIR += bsdlabel
+SUBDIR += fdisk
Added: head/sbin/Makefile.arm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/Makefile.arm Mon Sep 13 02:25:21 2010 (r212527)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SUBDIR += bsdlabel
+SUBDIR += fdisk
Added: head/sbin/Makefile.i386
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/Makefile.i386 Mon Sep 13 02:25:21 2010 (r212527)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR += bsdlabel
+SUBDIR += fdisk
+SUBDIR += sconfig
Added: head/sbin/Makefile.ia64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/Makefile.ia64 Mon Sep 13 02:25:21 2010 (r212527)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR += mca
Added: head/sbin/Makefile.mips
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/Makefile.mips Mon Sep 13 02:25:21 2010 (r212527)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SUBDIR += bsdlabel
+SUBDIR += fdisk
Added: head/sbin/Makefile.pc98
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/Makefile.pc98 Mon Sep 13 02:25:21 2010 (r212527)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR += bsdlabel
+SUBDIR += fdisk_pc98
+SUBDIR += sconfig
Added: head/sbin/Makefile.sparc64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/Makefile.sparc64 Mon Sep 13 02:25:21 2010 (r212527)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SUBDIR += bsdlabel
+SUBDIR += sunlabel
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
