===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.7
retrieving revision 1.84
diff -u -r1.7 -r1.84
--- src/usr.bin/Makefile	1996/03/27 19:32:19	1.7
+++ src/usr.bin/Makefile	2003/07/22 17:15:13	1.84
@@ -1,29 +1,39 @@
-#	$OpenBSD: Makefile,v 1.7 1996/03/27 19:32:19 niklas Exp $
-#	$NetBSD: Makefile,v 1.62 1996/03/10 05:45:43 thorpej Exp $
-#	from: @(#)Makefile	5.8.1.1 (Berkeley) 5/8/91
+#	$OpenBSD: Makefile,v 1.84 2003/07/22 17:15:13 brad Exp $
 
-SUBDIR=	apply apropos asa at banner basename bdes biff cal calendar cap_mkdb \
-	checknr chflags chpass cksum cmp col colcrt colrm column comm \
-	compress cpp crontab ctags cut dirname du \
-	eject env error expand false file find finger fmt fold fpr from \
-	fsplit fstat ftp gencat getconf getopt head hexdump id indent \
-	ipcrm ipcs join jot kdump ktrace lam last lastcomm leave less lex \
-	locate lock logger login logname look lorder m4 machine mail make man \
-	mesg mkdep mkfifo mkstr modstat msgs netstat newsyslog nfsstat nice \
-	nohup oldrdist pagesize passwd paste patch pr printenv printf quota \
-	rdist rdistd renice rev rlogin rpcgen rpcinfo rs \
-	rsh rup ruptime rusers rwall rwho \
-	script sed shar showmount skey skeyinit soelim split strings \
-	su sup systat tail talk tcopy tee telnet tftp time \
-	tip tn3270 touch tput tr true tset tsort tty ul uname unexpand \
-	unifdef uniq units unvis users uudecode uuencode \
-	vacation vgrind vi vis vmstat w wall wc what whatis whereis \
-	which who whois window write \
-	xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich
+.include <bsd.own.mk>
 
-# Don't use the standard tool chain on the alpha or mips.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips")
-SUBDIR+= ar gprof nm ranlib size strip
+SUBDIR= apply apropos arch asa asn1_compile at aucat audioctl awk banner \
+	basename bdes \
+	biff cal calendar cap_mkdb cdio checknr chpass cksum cmp col \
+	colcrt colrm column comm compile_et compress cpp crontab ctags cut \
+	deroff dirname du elf2olf encrypt env expand false file file2c \
+	find fgen finger fmt fold from fsplit fstat ftp gencat getconf getopt \
+	gprof grep head hexdump id indent infocmp ipcrm ipcs join jot kdump \
+	keynote ktrace lam last lastcomm leave less lex lndir locate lock \
+	logger login logname look lorder m4 mail make man mesg mg midiplay \
+	mixerctl mkdep mkstr mktemp modstat msgs nc netstat newsyslog nfsstat \
+	nice nohup oldrdist pagesize passwd paste patch pctr pmdb pr printenv \
+	printf quota radioctl rdist rdistd readlink renice rev rpcgen rpcinfo \
+	rs rsh \
+	rup ruptime rusers rwall rwho script sectok sed shar showmount skey \
+	skeyaudit skeyinfo skeyinit sort spell split ssh su sup systat sudo \
+	tail talk tcopy tee telnet tftp tic time tip tn3270 top touch tput tr \
+	true tset tsort tty usbhidaction usbhidctl ul uname unexpand unifdef \
+	uniq units \
+	unvis users uudecode uuencode vacation vgrind vi vis vmstat w wall wc \
+	what whatis which who whois window write x99token xargs xinstall xlint \
+	xstr yacc yes
+
+.if (${YP:L} == "yes")
+SUBDIR+=ypcat ypmatch ypwhich
+.endif
+
+.if (${ELF_TOOLCHAIN:L} == "no")
+SUBDIR+= ar nm ranlib size strip strings
+.endif
+
+.if   make(clean) || make(cleandir) || make(obj)
+SUBDIR+= elf2ecoff elf2aout
 .endif
 
 .include <bsd.subdir.mk>