aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2014-05-06 04:22:01 +0000
committerWarner Losh <imp@FreeBSD.org>2014-05-06 04:22:01 +0000
commitc6063d0da8e1f8d8452b0c2ee1c7ad718c1a7052 (patch)
treefeab560c7ac78d6da6d5e59636d346110d120bd7 /lib
parent5e84b765f494ad58dd436e816b4b38dd5a0e3d09 (diff)
downloadsrc-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 'lib')
-rw-r--r--lib/Makefile2
-rw-r--r--lib/atf/Makefile2
-rw-r--r--lib/atf/libatf-c++/Makefile1
-rw-r--r--lib/atf/libatf-c/Makefile1
-rw-r--r--lib/clang/Makefile2
-rw-r--r--lib/clang/clang.build.mk2
-rw-r--r--lib/clang/libllvmanalysis/Makefile2
-rw-r--r--lib/clang/libllvmipa/Makefile2
-rw-r--r--lib/clang/libllvmipo/Makefile2
-rw-r--r--lib/clang/libllvmmc/Makefile2
-rw-r--r--lib/clang/libllvmscalaropts/Makefile2
-rw-r--r--lib/clang/libllvmsupport/Makefile2
-rw-r--r--lib/clang/libllvmtransformutils/Makefile2
-rw-r--r--lib/clang/libllvmx86disassembler/Makefile2
-rw-r--r--lib/libarchive/Makefile2
-rw-r--r--lib/libbsnmp/libbsnmp/Makefile2
-rw-r--r--lib/libc/Makefile2
-rw-r--r--lib/libc_nonshared/Makefile2
-rw-r--r--lib/libcompiler_rt/Makefile2
-rw-r--r--lib/libcrypt/Makefile2
-rw-r--r--lib/libfetch/Makefile2
-rw-r--r--lib/libipsec/Makefile2
-rw-r--r--lib/libkiconv/Makefile2
-rw-r--r--lib/libmilter/Makefile2
-rw-r--r--lib/libpam/modules/modules.inc2
-rw-r--r--lib/libpam/modules/pam_unix/Makefile1
-rw-r--r--lib/libpcap/Makefile2
-rw-r--r--lib/libproc/Makefile2
-rw-r--r--lib/libprocstat/Makefile2
-rw-r--r--lib/libradius/Makefile2
-rw-r--r--lib/librpcsvc/Makefile2
-rw-r--r--lib/libsm/Makefile2
-rw-r--r--lib/libsmb/Makefile2
-rw-r--r--lib/libstand/Makefile2
-rw-r--r--lib/libtelnet/Makefile2
-rw-r--r--lib/libthr/Makefile2
-rw-r--r--lib/libulog/Makefile2
-rw-r--r--lib/libutil/Makefile2
-rw-r--r--lib/libwrap/Makefile2
-rw-r--r--lib/ncurses/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile2
41 files changed, 42 insertions, 37 deletions
diff --git a/lib/Makefile b/lib/Makefile
index fe99085104bf..de87cbaa8560 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -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:
diff --git a/lib/atf/Makefile b/lib/atf/Makefile
index a191f0da4d47..0772065f0822 100644
--- a/lib/atf/Makefile
+++ b/lib/atf/Makefile
@@ -25,7 +25,7 @@
#
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= libatf-c \
libatf-c++ \
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index d52e4965d0a1..84477f79927d 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -25,6 +25,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
LIB= atf-c++
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 69c46114e8bb..5c607f7b42da 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -25,6 +25,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
LIB= atf-c
diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index d335d80fbee2..ae7ae4a0a44d 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if !make(install)
.if !defined(EARLY_BUILD)
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index b58cd0cae6fa..057b8aa613b5 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
CLANG_SRCS= ${LLVM_SRCS}/tools/clang
CFLAGS+= -I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index 34725fc39cb2..ea2a7189c40f 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmanalysis
diff --git a/lib/clang/libllvmipa/Makefile b/lib/clang/libllvmipa/Makefile
index 85b75afa1c37..c866ca0ddfe0 100644
--- a/lib/clang/libllvmipa/Makefile
+++ b/lib/clang/libllvmipa/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmipa
diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile
index b1e90161786d..85af0360244a 100644
--- a/lib/clang/libllvmipo/Makefile
+++ b/lib/clang/libllvmipo/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmipo
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index 7fdc474eb7f1..84ba618902bb 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmmc
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
index 1f4edffeede9..8da4bf06d0c9 100644
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmscalaropts
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index eb3f633286cb..b7cfe6aa2d86 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmsupport
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
index f74209220254..cfad040c638d 100644
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmtransformutils
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index 797f2bf49a89..e5489a0e6089 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmx86disassembler
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index eb3921949931..bbe03a0bf126 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index 20015b98a9d0..0b9087d6540c 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -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}
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 34dac5255432..6b84f23c03b0 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -3,7 +3,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIBC_SRCTOP?= ${.CURDIR}
diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile
index e65fca06f8b6..db4fb32c7922 100644
--- a/lib/libc_nonshared/Makefile
+++ b/lib/libc_nonshared/Makefile
@@ -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
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 5f8039bc166f..91ce965739c9 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= compiler_rt
NO_PIC=
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index aca24d8f8af3..85bf94804fca 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -4,7 +4,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
SHLIB_MAJOR= 5
LIB= crypt
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 085aba2c6cb4..cef5f5a43c18 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= fetch
CFLAGS+= -I.
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 840aefa54f27..7d3e94a7db5a 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -29,7 +29,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= ipsec
SHLIB_MAJOR= 4
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index bda505eeaff1..c7b2179c1943 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -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
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index 0e625d0812a4..ca9838d9bff1 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -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
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index c570cfd2f77c..66fc63c89dc9 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MODULES =
MODULES += pam_chroot
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 4d28cfd6a44b..ea9e639c3b5f 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -34,6 +34,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
LIB= pam_unix
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 1a3e63409bb8..8cae1f1bdc49 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -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 \
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index fea6569438ad..7375a9ac43ab 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= proc
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index af5a775d7d05..32c7daa0b19c 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= procstat
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index cb68eaa32b1a..2b769d9ee61d 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -24,7 +24,7 @@
#
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= radius
SRCS= radlib.c
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 9c9e3ae04d53..ba972ac3e8eb 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -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
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 07172c75ea27..b30ba42e3af2 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsm
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index e464a8fd9875..ea7327b3e94c 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
.PATH: ${CONTRIBDIR}/lib/smb
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 5f645203597a..0e074d2a837e 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -9,7 +9,7 @@
MK_PROFILE= no
MK_SSP= no
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= stand
NO_PIC=
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 1cf52a01e882..1d388799a08a 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -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
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 1c70a5e71bd2..cfcc41efb997 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -10,7 +10,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
LIB=thr
diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile
index 074d9db9f87a..efbaece8fefb 100644
--- a/lib/libulog/Makefile
+++ b/lib/libulog/Makefile
@@ -2,7 +2,7 @@
SHLIBDIR?=/lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= ulog
SHLIB_MAJOR= 0
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 582cceffba4e..5e5139ff9fa0 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -3,7 +3,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= util
SHLIB_MAJOR= 9
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 2ae6821d7757..7c2ca9a5535e 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= wrap
SHLIB_MAJOR= 6
diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile
index b363f6462204..822905f44dcc 100644
--- a/lib/ncurses/Makefile
+++ b/lib/ncurses/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ncurses form menu panel
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 52cf0641510b..428ec80032e6 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -7,7 +7,7 @@ SHLIBDIR?= /lib
MK_MAN=no
.endif
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "${.CURDIR}/../config.mk"