=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v retrieving revision 1.37 retrieving revision 1.125 diff -u -r1.37 -r1.125 --- src/usr.bin/Makefile 1997/01/21 04:34:32 1.37 +++ src/usr.bin/Makefile 2012/08/30 15:53:47 1.125 @@ -1,46 +1,40 @@ -# $OpenBSD: Makefile,v 1.37 1997/01/21 04:34:32 millert 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.125 2012/08/30 15:53:47 kettenis Exp $ .include -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 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 renice rev rlogin rpcgen rpcinfo rs \ - rsh rup ruptime rusers rwall rwho \ - script sed shar showmount skey 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 vim vis vmstat w wall wc what whatis whereis \ - which who whois window write \ - xargs xinstall xlint xstr yacc yes \ - gprof +SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \ + basename bc bdes bgplg \ + biff cal calendar cap_mkdb cdio chpass cmp col colrm \ + column comm compile_et compress cpp crontab csplit ctags cut \ + dc deroff diff diff3 dirname du encrypt env expand false file \ + file2c find fgen finger fmt fold from fsplit fstat ftp gencat getcap \ + getconf getent getopt gprof grep gzsig head hexdump id indent \ + infocmp ipcrm ipcs \ + join jot kdump keynote ktrace lam last lastcomm leave less lex \ + libtool lndir \ + locate lock logger login logname look lorder \ + m4 mail make man mandoc mesg mg \ + midiplay mixerctl mkdep mklocale mkstr mktemp modstat nc netstat \ + newsyslog \ + nfsstat nice nm nohup oldrdist pagesize passwd paste patch pctr \ + pkg-config pkill \ + pr printenv printf quota radioctl ranlib rcs rdist rdistd \ + readlink renice rev rpcgen rpcinfo rs rsh rup ruptime rusers rwall \ + rwho sdiff script sed sendbug shar showmount skey \ + skeyaudit skeyinfo skeyinit sort spell split sqlite3 ssh stat su systat \ + sudo tail talk tcopy tcpbench tee telnet tftp tic time tip \ + tmux top touch tput tr true tset tsort tty usbhidaction usbhidctl \ + ul uname unexpand unifdef uniq units \ + unvis users uudecode uuencode vacation vi vis vmstat w wall wc \ + what whatis which who whois write x99token xargs xinstall \ + xstr yacc yes -.if defined(YP) +.if (${YP:L} == "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 +.if (${ELF_TOOLCHAIN:L} == "no") +SUBDIR+= strip strings .endif .include