===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.76
retrieving revision 1.80
diff -u -r1.76 -r1.80
--- src/usr.bin/Makefile	2002/03/01 22:01:11	1.76
+++ src/usr.bin/Makefile	2003/05/12 04:20:26	1.80
@@ -1,8 +1,9 @@
-#	$OpenBSD: Makefile,v 1.76 2002/03/01 22:01:11 millert Exp $
+#	$OpenBSD: Makefile,v 1.80 2003/05/12 04:20:26 hin Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes \
+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 error expand false file file2c \
@@ -12,12 +13,13 @@
 	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 pr printenv printf \
-	quota radioctl rdist rdistd readlink renice rev rlogin rpcgen rpcinfo \
+	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 usbhidctl ul uname unexpand unifdef uniq units \
+	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
@@ -26,9 +28,7 @@
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-# Don't use the standard tool chain on the alpha, powerpc, and hppa.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "powerpc" && \
-    ${MACHINE_ARCH} != "hppa" && ${MACHINE_ARCH} != "sparc64")
+.if (${ELF_TOOLCHAIN} != "yes")
 SUBDIR+= ar nm ranlib size strip strings
 .endif