===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.3
retrieving revision 1.27
diff -u -r1.3 -r1.27
--- src/usr.bin/Makefile	1995/12/16 11:46:37	1.3
+++ src/usr.bin/Makefile	1996/10/02 21:52:31	1.27
@@ -1,28 +1,44 @@
+#	$OpenBSD: Makefile,v 1.27 1996/10/02 21:52:31 pefo 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.3 1995/12/16 11:46:37 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 crontab ctags cut dirname du \
-	env error expand false file find finger fmt fold fpr from \
+.include <bsd.own.mk>
+
+SUBDIR=	apply apropos arch asa at awk banner basename bdes biff cal calendar \
+	cap_mkdb cdio checknr chflags chpass cksum cmp col colcrt colrm \
+	column comm compress cpp crontab ctags cut dirname du encrypt \
+	env error expand false file file2c find finger fmt fold from \
 	fsplit fstat ftp gencat getconf getopt head hexdump id indent \
-	ipcrm ipcs join jot kdump ktrace lam last lastcomm leave lex locate \
-	lock logger login logname look lorder m4 machine mail make man mesg \
-	mkdep mkfifo mkstr modstat more msgs netstat newsyslog nfsstat nice \
-	nohup pagesize passwd paste patch pr printenv printf quota \
-	rdist renice rev rlogin rpcgen rpcinfo rs \
+	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 mkdep mkfifo mkstr 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 \
 	rsh rup ruptime rusers rwall rwho \
-	script sed shar showmount skey skeyinit soelim split strings \
+	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 \
 	unifdef uniq units unvis users uudecode uuencode \
-	vacation vgrind vi vis vmstat w wall wc what whatis whereis \
+	vacation vgrind vi vim vis vmstat w wall wc what whatis whereis \
 	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 defined(YP)
+SUBDIR+=ypcat ypmatch ypwhich
+.endif
+
+# 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+= ar gprof nm ranlib size strip strings
+.endif
+
+.if   make(clean) || make(cleandir) || make(obj)
+SUBDIR+= pctr elf2ecoff
+.elif ${MACHINE_ARCH} == "i386"
+SUBDIR+= pctr
+.elif ${MACHINE_ARCH} == "mips"
+SUBDIR+= elf2ecoff
 .endif
 
 .include <bsd.subdir.mk>