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

from the latter.
This commit is contained in:
Warner Losh 2014-05-06 04:22:01 +00:00
parent 5e84b765f4
commit c6063d0da8
300 changed files with 312 additions and 295 deletions

View File

@ -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}/

View File

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

View File

@ -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

View File

@ -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}

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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 +=

View File

@ -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

View File

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

View File

@ -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}/[

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= lib sbin usr.bin usr.sbin

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= ${_drti} \
libavl \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= ${_tests} ${_zfs} ${_zpool}

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= \
ctfconvert \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= ${_dtrace} \
${_dtruss} \

View File

@ -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

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
FILES= ${_BSD.debug.dist} \
BSD.include.dist \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
FILES= 100.clean-disks \
110.clean-tmps \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
FILES= 450.status-security \
999.local

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
FILES= 100.chksetuid \
110.neggrpperm \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
FILES= 340.noid \
450.status-security \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
FILES= DAEMON \
FILESYSTEMS \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= \
bcd \

View File

@ -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

View File

@ -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

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
MK_SSP= no
GCCDIR= ${.CURDIR}/../../../contrib/gcc

View File

@ -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.

View File

@ -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

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
GCCVER= 4.2
GCCDIR= ${.CURDIR}/../../../contrib/gcc

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
GCCVER= 4.2
GCCDIR= ${.CURDIR}/../../../contrib/gcc

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= ${_binutils} \
${_cc} \

View File

@ -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

View File

@ -1,7 +1,7 @@
# $FreeBSD$
.include "../Makefile.inc0"
.include <bsd.own.mk>
.include <src.opts.mk>
.PATH: ${SRCDIR}/ld

View File

@ -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.

View File

@ -1,5 +1,6 @@
# $FreeBSD$
.include <src.opts.mk>
.include "../Makefile.inc"
# Sometimes this is .include'd several times...

View File

@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"

View File

@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"

View File

@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
CFLAGS+= -I.

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"

View File

@ -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}

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
GREP_LIBZ=YES

View File

@ -3,7 +3,7 @@
#
# Doing a "make install" builds /usr/include.
.include <bsd.own.mk>
.include <src.opts.mk>
CLEANFILES= osreldate.h version vers.c
SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
NO_OBJ=
INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
NO_LINT=

View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:

View File

@ -25,7 +25,7 @@
#
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= libatf-c \
libatf-c++ \

View File

@ -25,6 +25,7 @@
#
# $FreeBSD$
.include <src.opts.mk>
.include <bsd.init.mk>
LIB= atf-c++

View File

@ -25,6 +25,7 @@
#
# $FreeBSD$
.include <src.opts.mk>
.include <bsd.init.mk>
LIB= atf-c

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.if !make(install)
.if !defined(EARLY_BUILD)

View File

@ -1,5 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
CLANG_SRCS= ${LLVM_SRCS}/tools/clang
CFLAGS+= -I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmanalysis

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmipa

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmipo

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmmc

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmscalaropts

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmsupport

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmtransformutils

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= llvmx86disassembler

View File

@ -1,5 +1,5 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive

View File

@ -2,7 +2,7 @@
#
# Author: Harti Brandt <harti@freebsd.org>
.include <bsd.own.mk>
.include <src.opts.mk>
CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
.PATH: ${CONTRIB}

View File

@ -3,7 +3,7 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
LIBC_SRCTOP?= ${.CURDIR}

View File

@ -5,7 +5,7 @@
# compile modes.
# bsd.lib.mk doesn't have an easy way to express that.
MK_PROFILE?=no
.include <bsd.own.mk>
.include <src.opts.mk>
NO_PIC=
# -fpic on some platforms, -fPIC on others.
CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= compiler_rt
NO_PIC=

View File

@ -4,7 +4,7 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
SHLIB_MAJOR= 5
LIB= crypt

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= fetch
CFLAGS+= -I.

View File

@ -29,7 +29,7 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= ipsec
SHLIB_MAJOR= 4

View File

@ -2,7 +2,7 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= kiconv
SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
MODULES =
MODULES += pam_chroot

View File

@ -34,6 +34,7 @@
#
# $FreeBSD$
.include <src.opts.mk>
.include <bsd.init.mk>
LIB= pam_unix

View File

@ -3,7 +3,7 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= pcap
SRCS= grammar.y tokdefs.h version.h pcap-bpf.c \

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= proc

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= procstat

View File

@ -24,7 +24,7 @@
#
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= radius
SRCS= radlib.c

View File

@ -1,7 +1,7 @@
# from: @(#)Makefile 5.10 (Berkeley) 6/24/90
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.PATH: ${.CURDIR}/../../include/rpcsvc

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsm

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
.PATH: ${CONTRIBDIR}/lib/smb

View File

@ -9,7 +9,7 @@
MK_PROFILE= no
MK_SSP= no
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= stand
NO_PIC=

View File

@ -1,7 +1,7 @@
# From: @(#)Makefile 8.2 (Berkeley) 12/15/93
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
TELNETDIR= ${.CURDIR}/../../contrib/telnet
.PATH: ${TELNETDIR}/libtelnet

View File

@ -10,7 +10,7 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
MK_SSP= no
LIB=thr

View File

@ -2,7 +2,7 @@
SHLIBDIR?=/lib
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= ulog
SHLIB_MAJOR= 0

View File

@ -3,7 +3,7 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= util
SHLIB_MAJOR= 9

View File

@ -2,7 +2,7 @@
# $FreeBSD$
#
.include <bsd.own.mk>
.include <src.opts.mk>
LIB= wrap
SHLIB_MAJOR= 6

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= ncurses form menu panel

View File

@ -7,7 +7,7 @@ SHLIBDIR?= /lib
MK_MAN=no
.endif
.include <bsd.own.mk>
.include <src.opts.mk>
.include "${.CURDIR}/../config.mk"

View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
SUBDIR= ${_atf} \
${_atrun} \

View File

@ -25,6 +25,7 @@
#
# $FreeBSD$
.include <src.opts.mk>
.include <bsd.init.mk>
ATF= ${.CURDIR:H:H:H}/contrib/atf

View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 4/4/94
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
PROG= ftpd
MAN= ftpd.8 ftpchroot.5

View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
PROG= rlogind
MAN= rlogind.8

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
MK_SSP= no
PROG?= ld-elf.so.1

View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers

View File

@ -3,7 +3,7 @@
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.
.include <bsd.own.mk>
.include <src.opts.mk>
TELNETDIR= ${.CURDIR}/../../contrib/telnet
.PATH: ${TELNETDIR}/telnetd

View File

@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
.include <bsd.own.mk>
.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../../usr.bin/login

View File

@ -2,7 +2,7 @@
# $FreeBSD$
#
.include <bsd.own.mk>
.include <src.opts.mk>
MK_SSP= no
# Certain library entries have hard-coded references to

View File

@ -3,7 +3,7 @@
MAN=
.include <bsd.own.mk>
.include <src.opts.mk>
MK_SSP= no
PROG= rescue

Some files were not shown because too many files have changed in this diff Show More