===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.5
retrieving revision 1.45
diff -u -r1.5 -r1.45
--- src/usr.bin/Makefile	1996/01/29 00:54:01	1.5
+++ src/usr.bin/Makefile	1997/07/27 22:18:40	1.45
@@ -1,29 +1,45 @@
+#	$OpenBSD: Makefile,v 1.45 1997/07/27 22:18:40 downsj Exp $
+#	$NetBSD: Makefile,v 1.62 1996/03/10 05:45:43 thorpej Exp $
 #	from: @(#)Makefile	5.8.1.1 (Berkeley) 5/8/91
-#	$Id: Makefile,v 1.5 1996/01/29 00:54:01 deraadt 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 \
-	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 pagesize passwd paste patch pr printenv printf quota \
-	rdist renice rev rlogin rpcgen rpcinfo rs \
+.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 \
+	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 \
+	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 \
+	nfsstat nice nohup oldrdist pagesize passwd paste patch pr printenv \
+	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 strings \
-	su sup systat tail talk tcopy tee telnet tftp time \
+	script sed shar showmount skey skeyaudit skeyinfo skeyinit soelim sort \
+	split 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 \
+	vacation vgrind vi vis vmstat w wall wc what whatis \
 	which who whois window write \
-	xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich
+	xargs xinstall xlint xstr yacc yes
 
-# Don't use the standard tool chain on the alpha.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips")
-SUBDIR+= ar gprof nm ranlib size strip
+.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")
+SUBDIR+= ar nm ranlib size strip strings
+.endif
+
+.if   make(clean) || make(cleandir) || make(obj)
+SUBDIR+= pctr elf2ecoff elf2aout
+.elif ${MACHINE_ARCH} == "i386"
+SUBDIR+= pctr
+.elif ${MACHINE_ARCH} == "mips"
+SUBDIR+= elf2ecoff elf2aout
 .endif
 
 .include <bsd.subdir.mk>