Date: Tue, 6 May 2014 04:22:01 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265420 - in head: . bin bin/csh bin/date bin/ed bin/ls bin/mv bin/pax bin/pkill bin/sh bin/test cddl cddl/lib cddl/sbin cddl/usr.bin cddl/usr.sbin etc etc/mtree etc/periodic/daily etc/... Message-ID: <201405060422.s464M1nm065820@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue May 6 04:22:01 2014 New Revision: 265420 URL: http://svnweb.freebsd.org/changeset/base/265420 Log: Use src.opts.mk in preference to bsd.own.mk except where we need stuff from the latter. Modified: head/Makefile.inc1 head/bin/Makefile head/bin/Makefile.inc head/bin/csh/Makefile head/bin/date/Makefile head/bin/ed/Makefile head/bin/ls/Makefile head/bin/mv/Makefile head/bin/pax/Makefile head/bin/pkill/Makefile head/bin/sh/Makefile head/bin/test/Makefile head/cddl/Makefile head/cddl/lib/Makefile head/cddl/sbin/Makefile head/cddl/usr.bin/Makefile head/cddl/usr.sbin/Makefile head/etc/Makefile head/etc/mtree/Makefile head/etc/periodic/daily/Makefile head/etc/periodic/monthly/Makefile head/etc/periodic/security/Makefile head/etc/periodic/weekly/Makefile head/etc/rc.d/Makefile head/games/Makefile head/games/factor/Makefile head/gnu/Makefile head/gnu/lib/Makefile head/gnu/lib/csu/Makefile head/gnu/lib/libgcc/Makefile head/gnu/lib/libgcov/Makefile head/gnu/lib/libstdc++/Makefile head/gnu/lib/libsupc++/Makefile head/gnu/usr.bin/Makefile head/gnu/usr.bin/binutils/as/Makefile head/gnu/usr.bin/binutils/ld/Makefile head/gnu/usr.bin/cc/Makefile head/gnu/usr.bin/cc/Makefile.inc head/gnu/usr.bin/cc/c++/Makefile head/gnu/usr.bin/cc/cc/Makefile head/gnu/usr.bin/cc/cc1/Makefile head/gnu/usr.bin/cc/cc1plus/Makefile head/gnu/usr.bin/cc/cc_tools/Makefile head/gnu/usr.bin/cc/cpp/Makefile head/gnu/usr.bin/dialog/Makefile head/gnu/usr.bin/grep/Makefile head/include/Makefile head/include/arpa/Makefile head/kerberos5/Makefile.inc head/lib/Makefile head/lib/atf/Makefile head/lib/atf/libatf-c++/Makefile head/lib/atf/libatf-c/Makefile head/lib/clang/Makefile head/lib/clang/clang.build.mk head/lib/clang/libllvmanalysis/Makefile head/lib/clang/libllvmipa/Makefile head/lib/clang/libllvmipo/Makefile head/lib/clang/libllvmmc/Makefile head/lib/clang/libllvmscalaropts/Makefile head/lib/clang/libllvmsupport/Makefile head/lib/clang/libllvmtransformutils/Makefile head/lib/clang/libllvmx86disassembler/Makefile head/lib/libarchive/Makefile head/lib/libbsnmp/libbsnmp/Makefile head/lib/libc/Makefile head/lib/libc_nonshared/Makefile head/lib/libcompiler_rt/Makefile head/lib/libcrypt/Makefile head/lib/libfetch/Makefile head/lib/libipsec/Makefile head/lib/libkiconv/Makefile head/lib/libmilter/Makefile head/lib/libpam/modules/modules.inc head/lib/libpam/modules/pam_unix/Makefile head/lib/libpcap/Makefile head/lib/libproc/Makefile head/lib/libprocstat/Makefile head/lib/libradius/Makefile head/lib/librpcsvc/Makefile head/lib/libsm/Makefile head/lib/libsmb/Makefile head/lib/libstand/Makefile head/lib/libtelnet/Makefile head/lib/libthr/Makefile head/lib/libulog/Makefile head/lib/libutil/Makefile head/lib/libwrap/Makefile head/lib/ncurses/Makefile head/lib/ncurses/ncurses/Makefile head/libexec/Makefile head/libexec/atf/atf-check/Makefile head/libexec/ftpd/Makefile head/libexec/rlogind/Makefile head/libexec/rtld-elf/Makefile head/libexec/tcpd/Makefile head/libexec/telnetd/Makefile head/release/picobsd/tinyware/login/Makefile head/rescue/librescue/Makefile head/rescue/rescue/Makefile head/sbin/Makefile head/sbin/Makefile.inc head/sbin/atm/atmconfig/Makefile head/sbin/dhclient/Makefile head/sbin/geom/class/Makefile head/sbin/ggate/Makefile head/sbin/growfs/Makefile head/sbin/hastctl/Makefile head/sbin/hastd/Makefile head/sbin/ifconfig/Makefile head/sbin/ipfw/Makefile head/sbin/mdconfig/Makefile head/sbin/pfctl/Makefile head/sbin/ping/Makefile head/sbin/route/Makefile head/sbin/setkey/Makefile head/secure/Makefile head/secure/Makefile.inc head/secure/lib/Makefile head/secure/lib/libssh/Makefile head/secure/libexec/Makefile head/secure/libexec/sftp-server/Makefile head/secure/libexec/ssh-keysign/Makefile head/secure/libexec/ssh-pkcs11-helper/Makefile head/secure/usr.bin/Makefile head/secure/usr.bin/scp/Makefile head/secure/usr.bin/sftp/Makefile head/secure/usr.bin/ssh-add/Makefile head/secure/usr.bin/ssh-agent/Makefile head/secure/usr.bin/ssh-keygen/Makefile head/secure/usr.bin/ssh-keyscan/Makefile head/secure/usr.bin/ssh/Makefile head/secure/usr.sbin/Makefile head/secure/usr.sbin/sshd/Makefile head/share/Makefile head/share/doc/Makefile head/share/doc/smm/Makefile head/share/dtrace/Makefile head/share/examples/Makefile head/share/man/Makefile head/share/man/man1/Makefile head/share/man/man3/Makefile head/share/man/man4/Makefile head/share/man/man5/Makefile head/share/mk/Makefile head/share/mk/bsd.opts.mk head/share/mk/bsd.own.mk head/share/mk/src.opts.mk head/sys/Makefile head/sys/boot/Makefile head/sys/boot/amd64/efi/Makefile head/sys/boot/arm/at91/bootspi/Makefile head/sys/boot/arm/at91/libat91/Makefile head/sys/boot/arm/ixp425/boot2/Makefile head/sys/boot/arm/uboot/Makefile head/sys/boot/i386/Makefile head/sys/boot/i386/loader/Makefile head/sys/boot/ia64/common/Makefile head/sys/boot/ia64/efi/Makefile head/sys/boot/ia64/ski/Makefile head/sys/boot/libstand32/Makefile head/sys/boot/mips/beri/loader/Makefile head/sys/boot/pc98/loader/Makefile head/sys/boot/powerpc/ofw/Makefile head/sys/boot/powerpc/ps3/Makefile head/sys/boot/powerpc/uboot/Makefile head/sys/boot/sparc64/loader/Makefile head/sys/boot/uboot/lib/Makefile head/sys/boot/userboot/userboot/Makefile head/sys/conf/kern.pre.mk head/sys/modules/Makefile head/sys/modules/aic7xxx/ahc/Makefile head/sys/modules/carp/Makefile head/sys/modules/cxgb/Makefile head/sys/modules/cxgb/cxgb/Makefile head/sys/modules/cxgb/iw_cxgb/Makefile head/sys/modules/cxgb/tom/Makefile head/sys/modules/cxgbe/Makefile head/sys/modules/cxgbe/if_cxgbe/Makefile head/sys/modules/cxgbe/iw_cxgbe/Makefile head/sys/modules/cxgbe/tom/Makefile head/sys/modules/dpt/Makefile head/sys/modules/drm/Makefile head/sys/modules/dummynet/Makefile head/sys/modules/em/Makefile head/sys/modules/ep/Makefile head/sys/modules/if_bridge/Makefile head/sys/modules/if_gif/Makefile head/sys/modules/if_lagg/Makefile head/sys/modules/igb/Makefile head/sys/modules/ipdivert/Makefile head/sys/modules/ipfilter/Makefile head/sys/modules/ipfw/Makefile head/sys/modules/ipoib/Makefile head/sys/modules/ixgbe/Makefile head/sys/modules/mlx4/Makefile head/sys/modules/mlx4ib/Makefile head/sys/modules/mlxen/Makefile head/sys/modules/mthca/Makefile head/sys/modules/netgraph/Makefile head/sys/modules/netgraph/ipfw/Makefile head/sys/modules/netgraph/netflow/Makefile head/sys/modules/pf/Makefile head/sys/modules/pflog/Makefile head/sys/modules/pfsync/Makefile head/sys/modules/sound/driver/Makefile head/sys/modules/usb/Makefile head/sys/modules/virtio/network/Makefile head/sys/modules/vmware/vmxnet3/Makefile head/sys/modules/vx/Makefile head/sys/ofed/drivers/infiniband/hw/mlx4/Makefile head/sys/ofed/drivers/net/mlx4/Makefile head/tools/regression/priv/Makefile head/tools/tools/net80211/wlanwatch/Makefile head/usr.bin/Makefile head/usr.bin/apply/Makefile head/usr.bin/ar/Makefile head/usr.bin/atf/atf-sh/Makefile head/usr.bin/bmake/Makefile.inc head/usr.bin/calendar/Makefile head/usr.bin/chkey/Makefile head/usr.bin/chpass/Makefile head/usr.bin/clang/Makefile head/usr.bin/clang/clang/Makefile head/usr.bin/comm/Makefile head/usr.bin/cpio/Makefile head/usr.bin/fetch/Makefile head/usr.bin/file2c/Makefile head/usr.bin/ftp/Makefile head/usr.bin/grep/Makefile head/usr.bin/gzip/Makefile head/usr.bin/id/Makefile head/usr.bin/join/Makefile head/usr.bin/jot/Makefile head/usr.bin/kdump/Makefile head/usr.bin/lastcomm/Makefile head/usr.bin/lex/lib/Makefile head/usr.bin/logger/Makefile head/usr.bin/login/Makefile head/usr.bin/m4/Makefile head/usr.bin/make/Makefile head/usr.bin/ncal/Makefile head/usr.bin/netstat/Makefile head/usr.bin/newkey/Makefile head/usr.bin/passwd/Makefile head/usr.bin/printf/Makefile head/usr.bin/sed/Makefile head/usr.bin/sort/Makefile head/usr.bin/su/Makefile head/usr.bin/svn/Makefile.inc head/usr.bin/svn/lib/libapr_util/Makefile head/usr.bin/systat/Makefile head/usr.bin/tar/Makefile head/usr.bin/telnet/Makefile head/usr.bin/tr/Makefile head/usr.bin/uudecode/Makefile head/usr.bin/uuencode/Makefile head/usr.bin/vi/Makefile head/usr.bin/xargs/Makefile head/usr.bin/yacc/Makefile head/usr.sbin/Makefile head/usr.sbin/amd/Makefile.inc head/usr.sbin/amd/amd/Makefile head/usr.sbin/amd/include/Makefile head/usr.sbin/bootparamd/bootparamd/Makefile head/usr.sbin/bsdinstall/distextract/Makefile head/usr.sbin/bsdinstall/distfetch/Makefile head/usr.sbin/bsdinstall/partedit/Makefile head/usr.sbin/bsnmpd/bsnmpd/Makefile head/usr.sbin/bsnmpd/modules/Makefile head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile head/usr.sbin/etcupdate/Makefile head/usr.sbin/flowctl/Makefile head/usr.sbin/gssd/Makefile head/usr.sbin/ifmcstat/Makefile head/usr.sbin/inetd/Makefile head/usr.sbin/jail/Makefile head/usr.sbin/jls/Makefile head/usr.sbin/lpr/Makefile.inc head/usr.sbin/mailwrapper/Makefile head/usr.sbin/mtest/Makefile head/usr.sbin/newsyslog/Makefile head/usr.sbin/ngctl/Makefile head/usr.sbin/ntp/Makefile.inc head/usr.sbin/ntp/doc/Makefile head/usr.sbin/ntp/ntp-keygen/Makefile head/usr.sbin/ntp/ntpd/Makefile head/usr.sbin/ppp/Makefile head/usr.sbin/rpcbind/Makefile head/usr.sbin/sa/Makefile head/usr.sbin/sendmail/Makefile head/usr.sbin/syslogd/Makefile head/usr.sbin/tcpdchk/Makefile head/usr.sbin/tcpdmatch/Makefile head/usr.sbin/tcpdump/tcpdump/Makefile head/usr.sbin/trpt/Makefile head/usr.sbin/tzsetup/Makefile head/usr.sbin/wpa/hostapd/Makefile head/usr.sbin/wpa/wpa_supplicant/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue May 6 04:21:48 2014 (r265419) +++ head/Makefile.inc1 Tue May 6 04:22:01 2014 (r265420) @@ -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-lib # 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}/ Modified: head/bin/Makefile ============================================================================== --- head/bin/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= cat \ chflags \ Modified: head/bin/Makefile.inc ============================================================================== --- head/bin/Makefile.inc Tue May 6 04:21:48 2014 (r265419) +++ head/bin/Makefile.inc Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/bin/csh/Makefile ============================================================================== --- head/bin/csh/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/csh/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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} Modified: head/bin/date/Makefile ============================================================================== --- head/bin/date/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/date/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/bin/ed/Makefile ============================================================================== --- head/bin/ed/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/ed/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/bin/ls/Makefile ============================================================================== --- head/bin/ls/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/ls/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/bin/mv/Makefile ============================================================================== --- head/bin/mv/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/mv/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= mv Modified: head/bin/pax/Makefile ============================================================================== --- head/bin/pax/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/pax/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 += Modified: head/bin/pkill/Makefile ============================================================================== --- head/bin/pkill/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/pkill/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/bin/sh/Makefile ============================================================================== --- head/bin/sh/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/sh/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= sh INSTALLFLAGS= -S Modified: head/bin/test/Makefile ============================================================================== --- head/bin/test/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/bin/test/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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}/[ Modified: head/cddl/Makefile ============================================================================== --- head/cddl/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/cddl/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= lib sbin usr.bin usr.sbin Modified: head/cddl/lib/Makefile ============================================================================== --- head/cddl/lib/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/cddl/lib/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_drti} \ libavl \ Modified: head/cddl/sbin/Makefile ============================================================================== --- head/cddl/sbin/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/cddl/sbin/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_tests} ${_zfs} ${_zpool} Modified: head/cddl/usr.bin/Makefile ============================================================================== --- head/cddl/usr.bin/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/cddl/usr.bin/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= \ ctfconvert \ Modified: head/cddl/usr.sbin/Makefile ============================================================================== --- head/cddl/usr.sbin/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/cddl/usr.sbin/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_dtrace} \ ${_dtruss} \ Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/etc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/etc/mtree/Makefile ============================================================================== --- head/etc/mtree/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/etc/mtree/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= ${_BSD.debug.dist} \ BSD.include.dist \ Modified: head/etc/periodic/daily/Makefile ============================================================================== --- head/etc/periodic/daily/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/etc/periodic/daily/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 100.clean-disks \ 110.clean-tmps \ Modified: head/etc/periodic/monthly/Makefile ============================================================================== --- head/etc/periodic/monthly/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/etc/periodic/monthly/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 450.status-security \ 999.local Modified: head/etc/periodic/security/Makefile ============================================================================== --- head/etc/periodic/security/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/etc/periodic/security/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 100.chksetuid \ 110.neggrpperm \ Modified: head/etc/periodic/weekly/Makefile ============================================================================== --- head/etc/periodic/weekly/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/etc/periodic/weekly/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 340.noid \ 450.status-security \ Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/etc/rc.d/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= DAEMON \ FILESYSTEMS \ Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/games/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= \ bcd \ Modified: head/games/factor/Makefile ============================================================================== --- head/games/factor/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/games/factor/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/gnu/Makefile ============================================================================== --- head/gnu/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/gnu/lib/Makefile ============================================================================== --- head/gnu/lib/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/lib/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline Modified: head/gnu/lib/csu/Makefile ============================================================================== --- head/gnu/lib/csu/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/lib/csu/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MK_SSP= no GCCDIR= ${.CURDIR}/../../../contrib/gcc Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/lib/libgcc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -6,7 +6,7 @@ GCCLIB= ${.CURDIR}/../../../contrib/gccl 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. Modified: head/gnu/lib/libgcov/Makefile ============================================================================== --- head/gnu/lib/libgcov/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/lib/libgcov/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/gnu/lib/libstdc++/Makefile ============================================================================== --- head/gnu/lib/libstdc++/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/lib/libstdc++/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc Modified: head/gnu/lib/libsupc++/Makefile ============================================================================== --- head/gnu/lib/libsupc++/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/lib/libsupc++/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc Modified: head/gnu/usr.bin/Makefile ============================================================================== --- head/gnu/usr.bin/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_binutils} \ ${_cc} \ Modified: head/gnu/usr.bin/binutils/as/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/as/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/binutils/as/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/binutils/ld/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # $FreeBSD$ .include "../Makefile.inc0" -.include <bsd.own.mk> +.include <src.opts.mk> .PATH: ${SRCDIR}/ld Modified: head/gnu/usr.bin/cc/Makefile ============================================================================== --- head/gnu/usr.bin/cc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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. Modified: head/gnu/usr.bin/cc/Makefile.inc ============================================================================== --- head/gnu/usr.bin/cc/Makefile.inc Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/Makefile.inc Tue May 6 04:22:01 2014 (r265420) @@ -1,5 +1,6 @@ # $FreeBSD$ +.include <src.opts.mk> .include "../Makefile.inc" # Sometimes this is .include'd several times... Modified: head/gnu/usr.bin/cc/c++/Makefile ============================================================================== --- head/gnu/usr.bin/cc/c++/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/c++/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # $FreeBSD$ MAN= -.include <bsd.own.mk> +.include <src.opts.mk> .include "../Makefile.inc" .include "../Makefile.fe" Modified: head/gnu/usr.bin/cc/cc/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/cc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .include "../Makefile.inc" .include "../Makefile.fe" Modified: head/gnu/usr.bin/cc/cc1/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc1/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/cc1/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # $FreeBSD$ MAN= -.include <bsd.own.mk> +.include <src.opts.mk> .include "../Makefile.inc" Modified: head/gnu/usr.bin/cc/cc1plus/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc1plus/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/cc1plus/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # $FreeBSD$ MAN= -.include <bsd.own.mk> +.include <src.opts.mk> .include "../Makefile.inc" Modified: head/gnu/usr.bin/cc/cc_tools/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc_tools/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/cc_tools/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> CFLAGS+= -I. Modified: head/gnu/usr.bin/cc/cpp/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cpp/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/cc/cpp/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .include "../Makefile.inc" .include "../Makefile.fe" Modified: head/gnu/usr.bin/dialog/Makefile ============================================================================== --- head/gnu/usr.bin/dialog/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/dialog/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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} Modified: head/gnu/usr.bin/grep/Makefile ============================================================================== --- head/gnu/usr.bin/grep/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/gnu/usr.bin/grep/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> GREP_LIBZ=YES Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/include/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/include/arpa/Makefile ============================================================================== --- head/include/arpa/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/include/arpa/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/kerberos5/Makefile.inc ============================================================================== --- head/kerberos5/Makefile.inc Tue May 6 04:21:48 2014 (r265419) +++ head/kerberos5/Makefile.inc Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> NO_LINT= Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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: Modified: head/lib/atf/Makefile ============================================================================== --- head/lib/atf/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/atf/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -25,7 +25,7 @@ # # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= libatf-c \ libatf-c++ \ Modified: head/lib/atf/libatf-c++/Makefile ============================================================================== --- head/lib/atf/libatf-c++/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/atf/libatf-c++/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -25,6 +25,7 @@ # # $FreeBSD$ +.include <src.opts.mk> .include <bsd.init.mk> LIB= atf-c++ Modified: head/lib/atf/libatf-c/Makefile ============================================================================== --- head/lib/atf/libatf-c/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/atf/libatf-c/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -25,6 +25,7 @@ # # $FreeBSD$ +.include <src.opts.mk> .include <bsd.init.mk> LIB= atf-c Modified: head/lib/clang/Makefile ============================================================================== --- head/lib/clang/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .if !make(install) .if !defined(EARLY_BUILD) Modified: head/lib/clang/clang.build.mk ============================================================================== --- head/lib/clang/clang.build.mk Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/clang.build.mk Tue May 6 04:22:01 2014 (r265420) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <src.opts.mk> + CLANG_SRCS= ${LLVM_SRCS}/tools/clang CFLAGS+= -I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \ Modified: head/lib/clang/libllvmanalysis/Makefile ============================================================================== --- head/lib/clang/libllvmanalysis/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmanalysis/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmanalysis Modified: head/lib/clang/libllvmipa/Makefile ============================================================================== --- head/lib/clang/libllvmipa/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmipa/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmipa Modified: head/lib/clang/libllvmipo/Makefile ============================================================================== --- head/lib/clang/libllvmipo/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmipo/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmipo Modified: head/lib/clang/libllvmmc/Makefile ============================================================================== --- head/lib/clang/libllvmmc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmmc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmmc Modified: head/lib/clang/libllvmscalaropts/Makefile ============================================================================== --- head/lib/clang/libllvmscalaropts/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmscalaropts/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmscalaropts Modified: head/lib/clang/libllvmsupport/Makefile ============================================================================== --- head/lib/clang/libllvmsupport/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmsupport/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmsupport Modified: head/lib/clang/libllvmtransformutils/Makefile ============================================================================== --- head/lib/clang/libllvmtransformutils/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmtransformutils/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmtransformutils Modified: head/lib/clang/libllvmx86disassembler/Makefile ============================================================================== --- head/lib/clang/libllvmx86disassembler/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/clang/libllvmx86disassembler/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmx86disassembler Modified: head/lib/libarchive/Makefile ============================================================================== --- head/lib/libarchive/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libarchive/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,5 +1,5 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive Modified: head/lib/libbsnmp/libbsnmp/Makefile ============================================================================== --- head/lib/libbsnmp/libbsnmp/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libbsnmp/libbsnmp/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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} Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -3,7 +3,7 @@ SHLIBDIR?= /lib -.include <bsd.own.mk> +.include <src.opts.mk> LIBC_SRCTOP?= ${.CURDIR} Modified: head/lib/libc_nonshared/Makefile ============================================================================== --- head/lib/libc_nonshared/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libc_nonshared/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/lib/libcompiler_rt/Makefile ============================================================================== --- head/lib/libcompiler_rt/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libcompiler_rt/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= compiler_rt NO_PIC= Modified: head/lib/libcrypt/Makefile ============================================================================== --- head/lib/libcrypt/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libcrypt/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -4,7 +4,7 @@ SHLIBDIR?= /lib -.include <bsd.own.mk> +.include <src.opts.mk> SHLIB_MAJOR= 5 LIB= crypt Modified: head/lib/libfetch/Makefile ============================================================================== --- head/lib/libfetch/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libfetch/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= fetch CFLAGS+= -I. Modified: head/lib/libipsec/Makefile ============================================================================== --- head/lib/libipsec/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libipsec/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -29,7 +29,7 @@ SHLIBDIR?= /lib -.include <bsd.own.mk> +.include <src.opts.mk> LIB= ipsec SHLIB_MAJOR= 4 Modified: head/lib/libkiconv/Makefile ============================================================================== --- head/lib/libkiconv/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libkiconv/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/lib/libmilter/Makefile ============================================================================== --- head/lib/libmilter/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libmilter/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/lib/libpam/modules/modules.inc ============================================================================== --- head/lib/libpam/modules/modules.inc Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libpam/modules/modules.inc Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MODULES = MODULES += pam_chroot Modified: head/lib/libpam/modules/pam_unix/Makefile ============================================================================== --- head/lib/libpam/modules/pam_unix/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libpam/modules/pam_unix/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -34,6 +34,7 @@ # # $FreeBSD$ +.include <src.opts.mk> .include <bsd.init.mk> LIB= pam_unix Modified: head/lib/libpcap/Makefile ============================================================================== --- head/lib/libpcap/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libpcap/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 \ Modified: head/lib/libproc/Makefile ============================================================================== --- head/lib/libproc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libproc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= proc Modified: head/lib/libprocstat/Makefile ============================================================================== --- head/lib/libprocstat/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libprocstat/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= procstat Modified: head/lib/libradius/Makefile ============================================================================== --- head/lib/libradius/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libradius/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -24,7 +24,7 @@ # # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= radius SRCS= radlib.c Modified: head/lib/librpcsvc/Makefile ============================================================================== --- head/lib/librpcsvc/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/librpcsvc/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/lib/libsm/Makefile ============================================================================== --- head/lib/libsm/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libsm/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsm Modified: head/lib/libsmb/Makefile ============================================================================== --- head/lib/libsmb/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libsmb/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb Modified: head/lib/libstand/Makefile ============================================================================== --- head/lib/libstand/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libstand/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -9,7 +9,7 @@ MK_PROFILE= no MK_SSP= no -.include <bsd.own.mk> +.include <src.opts.mk> LIB= stand NO_PIC= Modified: head/lib/libtelnet/Makefile ============================================================================== --- head/lib/libtelnet/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libtelnet/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/lib/libthr/Makefile ============================================================================== --- head/lib/libthr/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libthr/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -10,7 +10,7 @@ SHLIBDIR?= /lib -.include <bsd.own.mk> +.include <src.opts.mk> MK_SSP= no LIB=thr Modified: head/lib/libulog/Makefile ============================================================================== --- head/lib/libulog/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libulog/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -2,7 +2,7 @@ SHLIBDIR?=/lib -.include <bsd.own.mk> +.include <src.opts.mk> LIB= ulog SHLIB_MAJOR= 0 Modified: head/lib/libutil/Makefile ============================================================================== --- head/lib/libutil/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libutil/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -3,7 +3,7 @@ SHLIBDIR?= /lib -.include <bsd.own.mk> +.include <src.opts.mk> LIB= util SHLIB_MAJOR= 9 Modified: head/lib/libwrap/Makefile ============================================================================== --- head/lib/libwrap/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/libwrap/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -2,7 +2,7 @@ # $FreeBSD$ # -.include <bsd.own.mk> +.include <src.opts.mk> LIB= wrap SHLIB_MAJOR= 6 Modified: head/lib/ncurses/Makefile ============================================================================== --- head/lib/ncurses/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/ncurses/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ncurses form menu panel Modified: head/lib/ncurses/ncurses/Makefile ============================================================================== --- head/lib/ncurses/ncurses/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/lib/ncurses/ncurses/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -7,7 +7,7 @@ SHLIBDIR?= /lib MK_MAN=no .endif -.include <bsd.own.mk> +.include <src.opts.mk> .include "${.CURDIR}/../config.mk" Modified: head/libexec/Makefile ============================================================================== --- head/libexec/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/libexec/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_atf} \ ${_atrun} \ Modified: head/libexec/atf/atf-check/Makefile ============================================================================== --- head/libexec/atf/atf-check/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/libexec/atf/atf-check/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -25,6 +25,7 @@ # # $FreeBSD$ +.include <src.opts.mk> .include <bsd.init.mk> ATF= ${.CURDIR:H:H:H}/contrib/atf Modified: head/libexec/ftpd/Makefile ============================================================================== --- head/libexec/ftpd/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/libexec/ftpd/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/libexec/rlogind/Makefile ============================================================================== --- head/libexec/rlogind/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/libexec/rlogind/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -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 Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Tue May 6 04:21:48 2014 (r265419) +++ head/libexec/rtld-elf/Makefile Tue May 6 04:22:01 2014 (r265420) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MK_SSP= no *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405060422.s464M1nm065820>