===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.63
retrieving revision 1.86
diff -u -r1.63 -r1.86
--- src/usr.bin/Makefile	2000/05/27 19:53:06	1.63
+++ src/usr.bin/Makefile	2003/09/26 07:33:03	1.86
@@ -1,39 +1,38 @@
-#	$OpenBSD: Makefile,v 1.63 2000/05/27 19:53:06 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.86 2003/09/26 07:33:03 otto Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes \
-	biff cal calendar cap_mkdb cdio checknr chflags chpass cksum cmp col \
+SUBDIR= apply apropos arch asa asn1_compile at aucat audioctl awk banner \
+	basename bc bdes \
+	biff cal calendar cap_mkdb cdio checknr chpass cksum cmp col \
 	colcrt colrm column comm compile_et compress cpp crontab ctags cut \
-	dirname du elf2olf encrypt env error expand false file file2c find \
-	finger fmt fold from fsplit fstat ftp gencat getconf getopt gprof \
-	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 midiplay mixerctl \
-	mkdep mkstr mktemp modstat msgs nc netstat newsyslog nfsstat nice \
-	nohup oldrdist pagesize passwd paste patch pctr pr printenv printf quota \
-	rdist rdistd readlink renice rev rlogin rpcgen rpcinfo rs rsh rup \
-	ruptime rusers rwall rwho script sed shar showmount skey skeyaudit \
-	skeyinfo skeyinit sort split ssh su sup systat sudo tail talk tcopy \
-	tee telnet tftp tic time tip tn3270 top 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 which \
-	who whois window write xargs xinstall xlint xstr yacc yes
+	dc deroff diff diff3 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} == "yes")
+.if (${YP:L} == "yes")
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-# Don't use the standard tool chain on the alpha, mips, powerpc, and hppa.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "hppa")
+.if (${ELF_TOOLCHAIN:L} == "no")
 SUBDIR+= ar nm ranlib size strip strings
 .endif
 
 .if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= elf2ecoff elf2aout
-.elif ${MACHINE_ARCH} == "i386"
-SUBDIR+= 
-.elif ${MACHINE_ARCH} == "mips"
 SUBDIR+= elf2ecoff elf2aout
 .endif