From owner-svn-src-user@FreeBSD.ORG Wed Feb 17 23:48:48 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 37AE11065679;
Wed, 17 Feb 2010 23:48:48 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 27DC28FC08;
Wed, 17 Feb 2010 23:48:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1HNmmwG093133;
Wed, 17 Feb 2010 23:48:48 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1HNmlIV093124;
Wed, 17 Feb 2010 23:48:47 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201002172348.o1HNmlIV093124@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 17 Feb 2010 23:48:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r204021 - user/imp/tbemd/sbin
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Feb 2010 23:48:48 -0000
Author: imp
Date: Wed Feb 17 23:48:47 2010
New Revision: 204021
URL: http://svn.freebsd.org/changeset/base/204021
Log:
First directory to apply the simplification of the ARCH specific parts
to. This also simplifies the MK_FOO items at the same time a little.
Briefly, we create a list for all platforms. We then augment it for a
specific platform. We then sort the result and do things
alphabetically.
Added:
user/imp/tbemd/sbin/Makefile.amd64
user/imp/tbemd/sbin/Makefile.arm
user/imp/tbemd/sbin/Makefile.i386
user/imp/tbemd/sbin/Makefile.ia64
user/imp/tbemd/sbin/Makefile.mips
user/imp/tbemd/sbin/Makefile.pc98
user/imp/tbemd/sbin/Makefile.sparc64
Modified:
user/imp/tbemd/sbin/Makefile
Modified: user/imp/tbemd/sbin/Makefile
==============================================================================
--- user/imp/tbemd/sbin/Makefile Wed Feb 17 23:47:08 2010 (r204020)
+++ user/imp/tbemd/sbin/Makefile Wed Feb 17 23:48:47 2010 (r204021)
@@ -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 \
@@ -38,15 +33,12 @@ SUBDIR= adjkerntz \
gvinum \
ifconfig \
init \
- ${_ipf} \
- ${_ipfw} \
iscontrol \
kldconfig \
kldload \
kldstat \
kldunload \
ldconfig \
- ${_mca} \
md5 \
mdconfig \
mdmfs \
@@ -60,96 +52,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_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "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_CPUARCH} == "i386"
-.if ${MACHINE} == "i386"
-_fdisk= fdisk
-.elif ${MACHINE} == "pc98"
-_fdisk_pc98= fdisk_pc98
-.endif
-_sconfig= sconfig
+_SUBDIR += routed
.endif
-.if ${MACHINE_CPUARCH} == "amd64"
-_fdisk= fdisk
-.endif
+.include <bsd.arch.inc.mk>
-.if ${MACHINE_CPUARCH} == "arm"
-_fdisk= fdisk
-.endif
-
-.if ${MACHINE_CPUARCH} == "ia64"
-_mca= mca
-.endif
-
-.if ${MACHINE_CPUARCH} == "sparc64"
-_sunlabel= sunlabel
-.endif
+SUBDIR=${_SUBDIR:O}
.include <bsd.subdir.mk>
Added: user/imp/tbemd/sbin/Makefile.amd64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/sbin/Makefile.amd64 Wed Feb 17 23:48:47 2010 (r204021)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+_SUBDIR += bsdlabel
+_SUBDIR += fdisk
Added: user/imp/tbemd/sbin/Makefile.arm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/sbin/Makefile.arm Wed Feb 17 23:48:47 2010 (r204021)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+_SUBDIR += bsdlabel
+_SUBDIR += fdisk
Added: user/imp/tbemd/sbin/Makefile.i386
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/sbin/Makefile.i386 Wed Feb 17 23:48:47 2010 (r204021)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+_SUBDIR += bsdlabel
+_SUBDIR += fdisk
+_SUBDIR += sconfig
Added: user/imp/tbemd/sbin/Makefile.ia64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/sbin/Makefile.ia64 Wed Feb 17 23:48:47 2010 (r204021)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+_SUBDIR += mca
Added: user/imp/tbemd/sbin/Makefile.mips
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/sbin/Makefile.mips Wed Feb 17 23:48:47 2010 (r204021)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+_SUBDIR += bsdlabel
+_SUBDIR += fdisk
Added: user/imp/tbemd/sbin/Makefile.pc98
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/sbin/Makefile.pc98 Wed Feb 17 23:48:47 2010 (r204021)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+_SUBDIR += bsdlabel
+_SUBDIR += fdisk_pc98
+_SUBDIR += sconfig
Added: user/imp/tbemd/sbin/Makefile.sparc64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/sbin/Makefile.sparc64 Wed Feb 17 23:48:47 2010 (r204021)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+_SUBDIR += bsdlabel
+_SUBDIR += sunlabel