diff options
| author | Warner Losh <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
| commit | c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052 (patch) | |
| tree | feab560c7ac78d6da6d5e59636d346110d120bd7 /usr.bin | |
| parent | 5e84b765f494ad58dd436e816b4b38dd5a0e3d09 (diff) | |
| download | src-c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052.tar.gz src-c6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052.zip | |
Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
Notes
Notes:
svn path=/head/; revision=265420
Diffstat (limited to 'usr.bin')
46 files changed, 48 insertions, 48 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index ef9381b27107..694a8d00f3ee 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile index bf37b9cff8eb..3ecf038f9282 100644 --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= apply DPADD= ${LIBSBUF} diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index 03d9814c1018..157d4113309c 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= ar SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile index de2e51e807f9..845521c80420 100644 --- a/usr.bin/atf/atf-sh/Makefile +++ b/usr.bin/atf/atf-sh/Makefile @@ -25,6 +25,7 @@ # # $FreeBSD$ +.include <src.opts.mk> .include <bsd.init.mk> ATF= ${.CURDIR:H:H:H}/contrib/atf diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 75678878da8c..b8e27e0e1f3b 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -1,13 +1,13 @@ # $FreeBSD$ -.include "bsd.own.mk" +.include "src.opts.mk" .if defined(.PARSEDIR) # make sure this is available to unit-tests/Makefile .export SRCTOP .endif -# Sadly, we cannot assume bsd.own.mk did its job, +# Sadly, we cannot assume src.opts.mk did its job, # nor can we safely include the one we want .if !defined(WITHOUT_BMAKE) MK_BMAKE= yes diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index b347a52a0f3b..32a107a32247 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= calendar SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \ diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile index 847e5c960106..a9e00e8a3d91 100644 --- a/usr.bin/chkey/Makefile +++ b/usr.bin/chkey/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .PATH: ${.CURDIR}/../newkey diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 566173e14d8d..cf3acc6bee15 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index f3e29578ca11..9655b06c4c65 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= clang clang-tblgen tblgen diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index ac6e685311e3..74ef867b441c 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG_CXX=clang diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile index 59c97514e394..ca9134358188 100644 --- a/usr.bin/comm/Makefile +++ b/usr.bin/comm/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= comm diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 635f4bce11ad..16446c4b4def 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 687f3eac73d1..ed56f2f40c51 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= fetch CSTD?= c99 diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile index 4a80e58a91fc..214d0336a015 100644 --- a/usr.bin/file2c/Makefile +++ b/usr.bin/file2c/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= file2c diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 55a36beecaa8..abdd6b7cdf74 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -2,7 +2,7 @@ # $NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $ # from: @(#)Makefile 8.2 (Berkeley) 4/3/94 -.include <bsd.own.mk> +.include <src.opts.mk> # Uncomment the following to provide defaults for gate-ftp operation # diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index abc2f447073f..c0c24dc27c17 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ -.include <bsd.own.mk> +.include <src.opts.mk> .if ${MK_BSD_GREP} == "yes" PROG= grep diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile index 6dcd62f8671a..73724358a560 100644 --- a/usr.bin/gzip/Makefile +++ b/usr.bin/gzip/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.16 2011/06/21 13:25:45 joerg Exp $ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= gzip MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1 diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile index 7d78b50c7440..d7e40493bfba 100644 --- a/usr.bin/id/Makefile +++ b/usr.bin/id/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= id LINKS= ${BINDIR}/id ${BINDIR}/groups diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile index 61634ee2ec09..c3f40e4be6b8 100644 --- a/usr.bin/join/Makefile +++ b/usr.bin/join/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -.include <bsd.own.mk> +.include <src.opts.mk> PROG= join diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile index ca646495316b..206c89312f45 100644 --- a/usr.bin/jot/Makefile +++ b/usr.bin/jot/Makefile @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= jot diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index f9d56cc2ec37..cba8e4102dab 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .if (${MACHINE_ARCH} == "amd64") SFX= 32 diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile index 88253757b7f1..54341caa6990 100644 --- a/usr.bin/lastcomm/Makefile +++ b/usr.bin/lastcomm/Makefile @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= lastcomm SRCS= lastcomm.c readrec.c diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile index d7e430f3e43f..4c28593aada9 100644 --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .PATH: ${.CURDIR}/../../../contrib/flex diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile index 922192ce919f..cbdd0b433b2b 100644 --- a/usr.bin/logger/Makefile +++ b/usr.bin/logger/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= logger diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index bd34ed9c6269..1ebc7602ad6d 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= login SRCS= login.c login_fbtab.c diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile index e6cf0b6b8c4c..13b99c8d0269 100644 --- a/usr.bin/m4/Makefile +++ b/usr.bin/m4/Makefile @@ -4,7 +4,7 @@ # -DEXTENDED # if you want the paste & spaste macros. -.include <bsd.own.mk> +.include <src.opts.mk> PROG= m4 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 9b8290c5b64a..27b295756b16 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= make CFLAGS+=-I${.CURDIR} diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile index 27aa5678ef30..b26605fbac21 100644 --- a/usr.bin/ncal/Makefile +++ b/usr.bin/ncal/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= ncal diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index ff97074e553a..2d50a495428b 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/12/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= netstat SRCS= if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \ diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile index b3b5b51d8c9f..bf4651352eed 100644 --- a/usr.bin/newkey/Makefile +++ b/usr.bin/newkey/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= newkey SRCS= newkey.c generic.c update.c diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index d657c804a549..3e6dc9393950 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG = passwd BINOWN = root diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile index 31047c53f931..759bcf75e982 100644 --- a/usr.bin/printf/Makefile +++ b/usr.bin/printf/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= printf diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile index b635c89ad576..a741da3233e6 100644 --- a/usr.bin/sed/Makefile +++ b/usr.bin/sed/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= sed SRCS= compile.c main.c misc.c process.c diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile index 3b257c2236a7..c6eef8561010 100644 --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= sort diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile index 0002e869c471..d5eb805e3f6e 100644 --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= su diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc index fb50b227567c..203b8175bd94 100644 --- a/usr.bin/svn/Makefile.inc +++ b/usr.bin/svn/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .if ${MK_SVN} == "yes" SVNLITE?= diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile index 4f25e8f5bfac..df2d1f9a2104 100644 --- a/usr.bin/svn/lib/libapr_util/Makefile +++ b/usr.bin/svn/lib/libapr_util/Makefile @@ -28,7 +28,7 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${APR}/include/arch/unix \ -I${APR}/include -.include <bsd.own.mk> +.include <src.opts.mk> .if ${MK_ICONV} == "yes" CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1 diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index 5773c36adf2d..8d024ffca9cc 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= systat SRCS= cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \ diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index d1f400bfa075..a289ea49a7ce 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 0ef55c50e296..d47bb91c4eb7 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/telnet diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile index 7c65daeb8dba..393b446614fd 100644 --- a/usr.bin/tr/Makefile +++ b/usr.bin/tr/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= tr SRCS= cmap.c cset.c str.c tr.c diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile index 7f3dde00e196..7063d6f719a4 100644 --- a/usr.bin/uudecode/Makefile +++ b/usr.bin/uudecode/Makefile @@ -1,12 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -MAN= - -.include <bsd.own.mk> +.include <src.opts.mk> PROG= uudecode LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode +MAN= .if ${MK_TESTS} != "no" SUBDIR+= tests diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile index 9c5e7291d367..eb2152f8bd8f 100644 --- a/usr.bin/uuencode/Makefile +++ b/usr.bin/uuencode/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= uuencode MAN= uuencode.1 uuencode.format.5 diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 445d79fba2f7..16675c9f73d2 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.include <bsd.own.mk> +.include <src.opts.mk> SRCDIR= ${.CURDIR}/../../contrib/nvi SUBDIR+= catalog diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile index b627bf5e73b4..034a0a6de353 100644 --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= xargs SRCS= xargs.c strnsubst.c diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile index 03f0d01225e6..45e7929db00b 100644 --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 5.3 (Berkeley) 5/12/90 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> BYACC_SRC= ${.CURDIR}/../../contrib/byacc .PATH: ${BYACC_SRC} |