Use src.opts.mk in preference to bsd.own.mk except where we need stuff

from the latter.
stacktic · May 6, 2014 · 2118f42 · 2118f42
1 parent 726190b
commit 2118f42
Show file tree

Hide file tree

Showing 300 changed files with 312 additions and 295 deletions.
diff --git a/Makefile.inc1 b/Makefile.inc1
@@ -45,7 +45,7 @@
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 .include <bsd.arch.inc.mk>
 .include <bsd.compiler.mk>
 
@@ -1808,7 +1808,7 @@ check-old: check-old-files check-old-libs check-old-dirs
 # showconfig - show build configuration.
 #
 showconfig:
-	@${MAKE} -n -f bsd.own.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort
+	@${MAKE} -n -f src.opts.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort
 
 .if !empty(KRNLOBJDIR) && !empty(KERNCONF)
 DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/

diff --git a/bin/Makefile b/bin/Makefile
@@ -1,7 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR= cat \
 	chflags \

diff --git a/bin/Makefile.inc b/bin/Makefile.inc
@@ -1,7 +1,7 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 BINDIR?=	/bin
 WARNS?=		6

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
@@ -6,7 +6,7 @@
 #
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 TCSHDIR= ${.CURDIR}/../../contrib/tcsh
 .PATH: ${TCSHDIR}

diff --git a/bin/date/Makefile b/bin/date/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c

diff --git a/bin/ls/Makefile b/bin/ls/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c

diff --git a/bin/mv/Makefile b/bin/mv/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	mv
 

diff --git a/bin/pax/Makefile b/bin/pax/Makefile
@@ -1,7 +1,7 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=

diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
@@ -1,7 +1,7 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	pkill
 

diff --git a/bin/sh/Makefile b/bin/sh/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	sh
 INSTALLFLAGS= -S

diff --git a/bin/test/Makefile b/bin/test/Makefile
@@ -1,7 +1,7 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[

diff --git a/cddl/Makefile b/cddl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR=	lib sbin usr.bin usr.sbin
 

diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR=	${_drti} \
 	libavl \

diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR=	${_tests} ${_zfs} ${_zpool}
 

diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR= \
 	ctfconvert \

diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR=	${_dtrace} \
 	${_dtruss} \

diff --git a/etc/Makefile b/etc/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .if ${MK_SENDMAIL} != "no"
 SUBDIR=	sendmail

diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 FILES=	${_BSD.debug.dist} \
 	BSD.include.dist \

diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 FILES=	100.clean-disks \
 	110.clean-tmps \

diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 FILES=	450.status-security \
 	999.local

diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 FILES=	100.chksetuid \
 	110.neggrpperm \

diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 FILES=	340.noid \
 	450.status-security \

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 FILES=	DAEMON \
 	FILESYSTEMS \

diff --git a/games/Makefile b/games/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR= \
 	bcd \

diff --git a/games/factor/Makefile b/games/factor/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	factor
 SRCS=	factor.c pr_tbl.c

diff --git a/gnu/Makefile b/gnu/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	5.33.1.1 (Berkeley) 5/6/91
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR= lib ${_tests} usr.bin
 

diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline
 

diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 MK_SSP=		no
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc

diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
@@ -6,7 +6,7 @@ GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 SHLIB_NAME=	libgcc_s.so.1
 SHLIBDIR?=	/lib
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 #
 # libgcc is linked in last and thus cannot depend on ssp symbols coming
 # from earlier libraries. Disable stack protection for this library.

diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
@@ -3,7 +3,7 @@
 MK_PROFILE=	no
 MK_SSP=		no
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc

diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 GCCVER=	4.2
 GCCDIR=	${.CURDIR}/../../../contrib/gcc

diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 GCCVER=	4.2
 GCCDIR=	${.CURDIR}/../../../contrib/gcc

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR= ${_binutils} \
 	${_cc} \

diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
@@ -4,7 +4,7 @@
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
 .include "${.CURDIR}/../Makefile.inc0"
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
 

diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .include "../Makefile.inc0"
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .PATH: ${SRCDIR}/ld
 

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.

diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
 .include "../Makefile.inc"
 
 # Sometimes this is .include'd several times...

diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"

diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"

diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .include "../Makefile.inc"
 

diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .include "../Makefile.inc"
 

diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 CFLAGS+=	-I.
 

diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"

diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
@@ -10,7 +10,7 @@ CFLAGS+= -I${.CURDIR} -I${DIALOG}
 
 WARNS?= 6
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 .if ${MK_NCURSESW} == "no"
 DPADD+=	${LIBNCURSES}

diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 GREP_LIBZ=YES