===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.35
retrieving revision 1.52
diff -u -r1.35 -r1.52
--- src/usr.bin/Makefile	1997/01/02 22:12:26	1.35
+++ src/usr.bin/Makefile	1998/07/24 19:33:51	1.52
@@ -1,46 +1,43 @@
-#	$OpenBSD: Makefile,v 1.35 1997/01/02 22:12:26 kstailey 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.52 1998/07/24 19:33:51 millert Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat awk banner basename bdes biff cal \
-	calendar cap_mkdb cdio checknr chflags chpass cksum cmp col colcrt \
+SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes biff \
+	cal calendar cap_mkdb cdio checknr chflags 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 head hexdump id \
-	indent \
+	fold from fsplit fstat ftp gencat getconf getopt gprof head hexdump \
+	id indent \
 	info_mkdb ipcrm ipcs join jot kdump ktrace lam last lastcomm leave \
-	less lex lndir locate lock logger login logname look lorder m4 machine \
-	mail make man mesg mk_cmds mkdep mkfifo mkstr mktemp modstat msgs nc \
-	netstat newsyslog \
+	less lex lndir locate lock logger login logname look lorder m4 \
+	machine mail make man mesg mixerctl mkdep mkfifo mkstr mktemp \
+	modstat msgs nc netstat newsyslog \
 	nfsstat nice nohup oldrdist pagesize passwd paste patch pr printenv \
-	printf quota rdist rdistd renice rev rlogin rpcgen rpcinfo rs \
+	printf quota rdist rdistd readlink renice rev rlogin rpcgen rpcinfo rs \
 	rsh rup ruptime rusers rwall rwho \
-	script sed shar showmount skey skeyinit soelim split \
-	su sup systat tail talk tcopy tee telnet tftp time \
-	tip tn3270 touch tput tr true tset tsort tty ul uname unexpand \
+	script sed shar showmount skey skeyaudit skeyinfo skeyinit soelim sort \
+	split su sup systat 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 vim vis vmstat w wall wc what whatis whereis \
+	vacation vgrind vi vis vmstat w wall wc what whatis \
 	which who whois window write \
-	xargs xinstall xlint xstr yacc yes \
-	gprof
+	xargs xinstall xlint xstr yacc yes
 
-.if defined(YP)
+.if (${YP} == "yes")
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-# Don't use the standard tool chain on the alpha or mips.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc")
+# 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")
 SUBDIR+= ar nm ranlib size strip strings
 .endif
 
 .if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= pctr elf2ecoff
+SUBDIR+= pctr elf2ecoff elf2aout
 .elif ${MACHINE_ARCH} == "i386"
 SUBDIR+= pctr
 .elif ${MACHINE_ARCH} == "mips"
-SUBDIR+= elf2ecoff
+SUBDIR+= elf2ecoff elf2aout
 .endif
 
 .include <bsd.subdir.mk>