# HG changeset patch # Parent bac8a9a6b2dbc519557df23802dfdb865e83d456 diff --git a/Makefile.inc1 b/Makefile.inc1 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -46,7 +46,7 @@ .error "Both TARGET and TARGET_ARCH must be defined." .endif -.include "share/mk/src.opts.mk" +.include "src.mk" .include .include diff --git a/bin/Makefile b/bin/Makefile --- a/bin/Makefile +++ b/bin/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= cat \ chflags \ diff --git a/bin/Makefile.inc b/bin/Makefile.inc --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,7 +1,7 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -.include +.include "${SRCTOP}/src.mk" BINDIR?= /bin WARNS?= 6 diff --git a/bin/csh/Makefile b/bin/csh/Makefile --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -6,7 +6,8 @@ # # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile. -.include +.include +.include "${SRCTOP}/src.mk" TCSHDIR= ${.CURDIR}/../../contrib/tcsh .PATH: ${TCSHDIR} diff --git a/bin/date/Makefile b/bin/date/Makefile --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= date SRCS= date.c netdate.c vary.c diff --git a/bin/ed/Makefile b/bin/ed/Makefile --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ls SRCS= cmp.c ls.c print.c util.c diff --git a/bin/mv/Makefile b/bin/mv/Makefile --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= mv diff --git a/bin/pax/Makefile b/bin/pax/Makefile --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/bin/pkill/Makefile +++ b/bin/pkill/Makefile @@ -1,7 +1,8 @@ # $NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= pkill diff --git a/bin/sh/Makefile b/bin/sh/Makefile --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= sh INSTALLFLAGS= -S diff --git a/bin/test/Makefile b/bin/test/Makefile --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ diff --git a/cddl/Makefile b/cddl/Makefile --- a/cddl/Makefile +++ b/cddl/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= lib sbin usr.bin usr.sbin diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc --- a/cddl/Makefile.inc +++ b/cddl/Makefile.inc @@ -1,5 +1,7 @@ # $FreeBSD$ +.include "${SRCTOP}/src.mk" + OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_drti} \ libavl \ diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile --- a/cddl/sbin/Makefile +++ b/cddl/sbin/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_tests} ${_zfs} ${_zpool} diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= \ ctfconvert \ diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_dtrace} \ ${_dtruss} \ diff --git a/etc/Makefile b/etc/Makefile --- a/etc/Makefile +++ b/etc/Makefile @@ -1,7 +1,8 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .if ${MK_SENDMAIL} != "no" SUBDIR= sendmail diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" FILES= ${_BSD.debug.dist} \ BSD.include.dist \ diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" FILES= 100.clean-disks \ 110.clean-tmps \ diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile --- a/etc/periodic/monthly/Makefile +++ b/etc/periodic/monthly/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" FILES= 450.status-security \ 999.local diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile --- a/etc/periodic/security/Makefile +++ b/etc/periodic/security/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" FILES= 100.chksetuid \ 110.neggrpperm \ diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile --- a/etc/periodic/weekly/Makefile +++ b/etc/periodic/weekly/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" FILES= 340.noid \ 450.status-security \ diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" FILES= DAEMON \ FILESYSTEMS \ diff --git a/games/Makefile b/games/Makefile --- a/games/Makefile +++ b/games/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= \ bcd \ diff --git a/games/Makefile.inc b/games/Makefile.inc --- a/games/Makefile.inc +++ b/games/Makefile.inc @@ -1,6 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include "${SRCTOP}/src.mk" + BINDIR?= /usr/games FILESDIR?= ${SHAREDIR}/games WARNS?= 6 diff --git a/games/factor/Makefile b/games/factor/Makefile --- a/games/factor/Makefile +++ b/games/factor/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= factor SRCS= factor.c pr_tbl.c diff --git a/gnu/Makefile b/gnu/Makefile --- a/gnu/Makefile +++ b/gnu/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 5.33.1.1 (Berkeley) 5/6/91 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= lib ${_tests} usr.bin diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc --- a/gnu/Makefile.inc +++ b/gnu/Makefile.inc @@ -1,5 +1,7 @@ # $FreeBSD$ +.include "${SRCTOP}/src.mk" + # Do not lint the GNU stuff. It is all externally maintained and # lint output is wasteful noise here. diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" + MK_SSP= no GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -6,7 +6,8 @@ GCCLIB= ${.CURDIR}/../../../contrib/gccl SHLIB_NAME= libgcc_s.so.1 SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.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 --- a/gnu/lib/libgcov/Makefile +++ b/gnu/lib/libgcov/Makefile @@ -3,7 +3,8 @@ MK_PROFILE= no MK_SSP= no -.include +.include +.include "${SRCTOP}/src.mk" .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_binutils} \ ${_cc} \ diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile --- a/gnu/usr.bin/binutils/as/Makefile +++ b/gnu/usr.bin/binutils/as/Makefile @@ -4,7 +4,8 @@ # BINDIR .include "${.CURDIR}/../../Makefile.inc" .include "${.CURDIR}/../Makefile.inc0" -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ .include "../Makefile.inc0" -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${SRCDIR}/ld diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${SRCTOP}/src.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 --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ MAN= -.include +.include +.include "${SRCTOP}/src.mk" .include "../Makefile.inc" .include "../Makefile.fe" diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile --- a/gnu/usr.bin/cc/cc/Makefile +++ b/gnu/usr.bin/cc/cc/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include "../Makefile.inc" .include "../Makefile.fe" diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile --- a/gnu/usr.bin/cc/cc1/Makefile +++ b/gnu/usr.bin/cc/cc1/Makefile @@ -1,13 +1,14 @@ # $FreeBSD$ -MAN= -.include +.include +.include "${SRCTOP}/src.mk" .include "../Makefile.inc" .PATH: ${GCCDIR} PROG= cc1 +MAN= SRCS= main.c c-parser.c c-lang.c BINDIR= /usr/libexec .if ${MK_SHARED_TOOLCHAIN} == "no" diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile --- a/gnu/usr.bin/cc/cc1plus/Makefile +++ b/gnu/usr.bin/cc/cc1plus/Makefile @@ -1,13 +1,14 @@ # $FreeBSD$ -MAN= -.include +.include +.include "${SRCTOP}/src.mk" .include "../Makefile.inc" .PATH: ${GCCDIR}/cp ${GCCDIR} PROG= cc1plus +MAN= SRCS= cfns.h SRCS+= main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \ decl.c decl2.c error.c except.c expr.c dump.c friend.c init.c lex.c \ diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include "../Makefile.inc" .include "../Makefile.ver" diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" CFLAGS+= -I. diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile --- a/gnu/usr.bin/cc/cpp/Makefile +++ b/gnu/usr.bin/cc/cpp/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include "../Makefile.inc" .include "../Makefile.fe" diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" GREP_LIBZ=YES diff --git a/include/Makefile b/include/Makefile --- a/include/Makefile +++ b/include/Makefile @@ -3,7 +3,8 @@ # # Doing a "make install" builds /usr/include. -.include +.include +.include "${SRCTOP}/src.mk" CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc xlocale diff --git a/include/arpa/Makefile b/include/arpa/Makefile --- a/include/arpa/Makefile +++ b/include/arpa/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" NO_OBJ= INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${SRCTOP}/src.mk" NO_LINT= diff --git a/lib/Makefile b/lib/Makefile --- a/lib/Makefile +++ b/lib/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # The SUBDIR_ORDERED list is a small set of libraries which are used by many # of the other libraries. These are built first with a .WAIT between them diff --git a/lib/Makefile.inc b/lib/Makefile.inc --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -1,4 +1,7 @@ # $FreeBSD$ + +.include "${SRCTOP}/src.mk" + # Default version for system libs (override in /Makefile if necessary) SHLIB_MAJOR?= 5 diff --git a/lib/atf/Makefile b/lib/atf/Makefile --- a/lib/atf/Makefile +++ b/lib/atf/Makefile @@ -25,7 +25,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= libatf-c \ libatf-c++ \ diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile --- a/lib/atf/libatf-c++/Makefile +++ b/lib/atf/libatf-c++/Makefile @@ -25,7 +25,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include LIB= atf-c++ diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile --- a/lib/atf/libatf-c/Makefile +++ b/lib/atf/libatf-c/Makefile @@ -25,7 +25,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include LIB= atf-c diff --git a/lib/clang/Makefile b/lib/clang/Makefile --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .if !make(install) .if ${MK_CLANG_FULL} != "no" diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" CLANG_SRCS= ${LLVM_SRCS}/tools/clang diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile --- a/lib/clang/libllvmanalysis/Makefile +++ b/lib/clang/libllvmanalysis/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmanalysis diff --git a/lib/clang/libllvmipa/Makefile b/lib/clang/libllvmipa/Makefile --- a/lib/clang/libllvmipa/Makefile +++ b/lib/clang/libllvmipa/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmipa diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile --- a/lib/clang/libllvmipo/Makefile +++ b/lib/clang/libllvmipo/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmipo diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile --- a/lib/clang/libllvmmc/Makefile +++ b/lib/clang/libllvmmc/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmmc diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile --- a/lib/clang/libllvmscalaropts/Makefile +++ b/lib/clang/libllvmscalaropts/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmscalaropts diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile --- a/lib/clang/libllvmsupport/Makefile +++ b/lib/clang/libllvmsupport/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmsupport diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile --- a/lib/clang/libllvmtransformutils/Makefile +++ b/lib/clang/libllvmtransformutils/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmtransformutils diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile --- a/lib/clang/libllvmx86disassembler/Makefile +++ b/lib/clang/libllvmx86disassembler/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= llvmx86disassembler diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile --- a/lib/libbsnmp/libbsnmp/Makefile +++ b/lib/libbsnmp/libbsnmp/Makefile @@ -2,7 +2,8 @@ # # Author: Harti Brandt -.include +.include +.include "${SRCTOP}/src.mk" CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib .PATH: ${CONTRIB} diff --git a/lib/libc/Makefile b/lib/libc/Makefile --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -3,7 +3,8 @@ SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.mk" LIBC_SRCTOP?= ${.CURDIR} diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile --- a/lib/libc_nonshared/Makefile +++ b/lib/libc_nonshared/Makefile @@ -5,7 +5,8 @@ # compile modes. # bsd.lib.mk doesn't have an easy way to express that. MK_PROFILE?=no -.include +.include +.include "${SRCTOP}/src.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 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= compiler_rt NO_PIC= diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -4,7 +4,8 @@ SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.mk" SHLIB_MAJOR= 5 LIB= crypt diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= fetch CFLAGS+= -I. diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -29,7 +29,8 @@ SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.mk" LIB= ipsec SHLIB_MAJOR= 4 diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile --- a/lib/libkiconv/Makefile +++ b/lib/libkiconv/Makefile @@ -2,7 +2,8 @@ SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.mk" LIB= kiconv SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "../../../src.mk" MODULES = MODULES += pam_chroot diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -34,7 +34,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include LIB= pam_unix diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -3,7 +3,8 @@ SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.mk" LIB= pcap SRCS= grammar.y tokdefs.h version.h pcap-bpf.c \ diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= proc diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= procstat diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -24,7 +24,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= radius SRCS= radlib.c diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -1,7 +1,8 @@ # from: @(#)Makefile 5.10 (Berkeley) 6/24/90 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../include/rpcsvc diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsm diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -9,7 +9,8 @@ MK_PROFILE= no MK_SSP= no -.include +.include +.include "${SRCTOP}/src.mk" LIB= stand NO_PIC= diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/libtelnet diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -10,7 +10,8 @@ SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no LIB=thr diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile --- a/lib/libulog/Makefile +++ b/lib/libulog/Makefile @@ -2,7 +2,8 @@ SHLIBDIR?=/lib -.include +.include +.include "${SRCTOP}/src.mk" LIB= ulog SHLIB_MAJOR= 0 diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -3,7 +3,8 @@ SHLIBDIR?= /lib -.include +.include +.include "${SRCTOP}/src.mk" LIB= util SHLIB_MAJOR= 9 diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile --- a/lib/libwrap/Makefile +++ b/lib/libwrap/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" LIB= wrap SHLIB_MAJOR= 6 diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -7,7 +7,8 @@ SHLIBDIR?= /lib MK_MAN=no .endif -.include +.include +.include "${SRCTOP}/src.mk" .include "${.CURDIR}/../config.mk" diff --git a/libexec/Makefile b/libexec/Makefile --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_atf} \ ${_atrun} \ diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc --- a/libexec/Makefile.inc +++ b/libexec/Makefile.inc @@ -1,6 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ +.include "${SRCTOP}/src.mk" + BINDIR?= /usr/libexec WARNS?= 6 diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -25,7 +25,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include ATF= ${.CURDIR:H:H:H}/contrib/atf diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ftpd MAN= ftpd.8 ftpchroot.5 diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile --- a/libexec/rlogind/Makefile +++ b/libexec/rlogind/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= rlogind MAN= rlogind.8 diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no PROG?= ld-elf.so.1 diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../contrib/tcp_wrappers diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -3,7 +3,8 @@ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. -.include +.include +.include "${SRCTOP}/src.mk" TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/telnetd diff --git a/release/picobsd/tinyware/login/Makefile b/release/picobsd/tinyware/login/Makefile --- a/release/picobsd/tinyware/login/Makefile +++ b/release/picobsd/tinyware/login/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../../usr.bin/login diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile --- a/rescue/librescue/Makefile +++ b/rescue/librescue/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no # Certain library entries have hard-coded references to diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -1,7 +1,8 @@ #$FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -.include +.include +.include "${SRCTOP}/src.mk" MAN= MK_SSP= no diff --git a/sbin/Makefile b/sbin/Makefile --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # XXX MISSING: icheck ncheck diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc --- a/sbin/Makefile.inc +++ b/sbin/Makefile.inc @@ -1,7 +1,7 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/8/93 # $FreeBSD$ -.include +.include "${SRCTOP}/src.mk" BINDIR?= /sbin WARNS?= 6 diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile --- a/sbin/atm/atmconfig/Makefile +++ b/sbin/atm/atmconfig/Makefile @@ -5,7 +5,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= atmconfig .ifndef RESCUE diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile --- a/sbin/dhclient/Makefile +++ b/sbin/dhclient/Makefile @@ -31,7 +31,8 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. # -.include +.include +.include "${SRCTOP}/src.mk" SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \ tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \ diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile --- a/sbin/geom/class/Makefile +++ b/sbin/geom/class/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= cache SUBDIR+=concat diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile --- a/sbin/ggate/Makefile +++ b/sbin/ggate/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_ggatec} \ ${_ggated} \ diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -6,7 +6,8 @@ #GFSDBG= -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../mount diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile --- a/sbin/hastctl/Makefile +++ b/sbin/hastctl/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../hastd diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile --- a/sbin/hastd/Makefile +++ b/sbin/hastd/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= hastd SRCS= activemap.c diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ifconfig diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile --- a/sbin/ipfw/Makefile +++ b/sbin/ipfw/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ipfw SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile --- a/sbin/mdconfig/Makefile +++ b/sbin/mdconfig/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= mdconfig MAN= mdconfig.8 diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile --- a/sbin/pfctl/Makefile +++ b/sbin/pfctl/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # pf_ruleset.c is shared between kernel and pfctl .PATH: ${.CURDIR}/../../sys/netpfil/pf diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ping MAN= ping.8 diff --git a/sbin/route/Makefile b/sbin/route/Makefile --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= route MAN= route.8 diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile --- a/sbin/setkey/Makefile +++ b/sbin/setkey/Makefile @@ -27,7 +27,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= setkey MAN= setkey.8 diff --git a/secure/Makefile b/secure/Makefile --- a/secure/Makefile +++ b/secure/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= lib libexec ${_tests} usr.bin usr.sbin diff --git a/secure/Makefile.inc b/secure/Makefile.inc --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${SRCTOP}/src.mk" .if exists(${.CURDIR}/../../lib/libcrypt/obj) CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj diff --git a/secure/lib/Makefile b/secure/lib/Makefile --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= .if ${MK_OPENSSL} != "no" diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIB= ssh PRIVATELIB= true diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= .if ${MK_OPENSSH} != "no" diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= sftp-server SRCS= sftp-server.c sftp-common.c sftp-server-main.c diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ssh-keysign SRCS= ssh-keysign.c roaming_dummy.c readconf.c diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ssh-pkcs11-helper SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= .if ${MK_OPENSSL} != "no" diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= scp SRCS= scp.c diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ssh-add SRCS+= ssh-add.c diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ssh-agent SRCS= ssh-agent.c diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ssh-keygen SRCS= ssh-keygen.c diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ssh-keyscan SRCS= ssh-keyscan.c roaming_dummy.c diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ssh CFLAGS+=-I${SSHDIR} -include ssh_namespace.h diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile --- a/secure/usr.sbin/Makefile +++ b/secure/usr.sbin/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= .if ${MK_OPENSSH} != "no" diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ diff --git a/share/Makefile b/share/Makefile --- a/share/Makefile +++ b/share/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # Do not include `info' in the SUBDIR list, it is handled separately. diff --git a/share/Makefile.inc b/share/Makefile.inc --- a/share/Makefile.inc +++ b/share/Makefile.inc @@ -1,6 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/5/93 # $FreeBSD$ +.include "${SRCTOP}/src.mk" + BINDIR?= ${SHAREDIR} BINOWN= ${SHAREOWN} BINGRP= ${SHAREGRP} diff --git a/share/doc/Makefile b/share/doc/Makefile --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_IPv6} \ ${_atf} \ diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile --- a/share/doc/smm/Makefile +++ b/share/doc/smm/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/10/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # The following modules do not describe FreeBSD: # 14.uucpimpl, 15.uucpnet diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile --- a/share/dtrace/Makefile +++ b/share/dtrace/Makefile @@ -4,7 +4,8 @@ # the DTraceToolkit. # -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= ${_toolkit} diff --git a/share/examples/Makefile b/share/examples/Makefile --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -2,7 +2,8 @@ # # Doing a make install builds /usr/share/examples -.include +.include +.include "${SRCTOP}/src.mk" LDIRS= BSD_daemon \ FreeBSD_version \ diff --git a/share/man/Makefile b/share/man/Makefile --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 4/16/94 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # XXX MISSING: man3f SUBDIR= man1 man3 man4 man5 man6 man7 man8 man9 diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MAN= builtin.1 intro.1 diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MAN= assert.3 \ ATOMIC_VAR_INIT.3 \ diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MAN= aac.4 \ aacraid.4 \ diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" #MISSING: dump.5 plot.5 MAN= acct.5 \ diff --git a/share/mk/Makefile b/share/mk/Makefile --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -.include +.include +.include "${SRCTOP}/src.mk" FILES= \ bsd.README \ @@ -34,6 +35,7 @@ FILES= \ bsd.port.subdir.mk \ bsd.prog.mk \ bsd.progs.mk \ + bsd.srctop.mk \ bsd.snmpmod.mk \ bsd.subdir.mk \ bsd.symver.mk \ diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -8,6 +8,7 @@ .if !target(____) ____: +.include .include .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" diff --git a/share/mk/src.opts.mk b/src.mk rename from share/mk/src.opts.mk rename to src.mk diff --git a/sys/Makefile b/sys/Makefile --- a/sys/Makefile +++ b/sys/Makefile @@ -71,7 +71,8 @@ glimpse-clean: .if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS) || \ make(glimpse) || make(glimpse-clean)) -.include +.include +.include "${SRCTOP}/src.mk" # The boot loader .if ${MK_BOOT} != "no" diff --git a/sys/boot/Makefile b/sys/boot/Makefile --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include .if ${MK_FORTH} != "no" diff --git a/sys/boot/amd64/efi/Makefile b/sys/boot/amd64/efi/Makefile --- a/sys/boot/amd64/efi/Makefile +++ b/sys/boot/amd64/efi/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ +.include +.include "${SRCTOP}/src.mk" + MAN= -.include - # In-tree GCC does not support __attribute__((ms_abi)). .if ${COMPILER_TYPE} != "gcc" diff --git a/sys/boot/arm/at91/bootspi/Makefile b/sys/boot/arm/at91/bootspi/Makefile --- a/sys/boot/arm/at91/bootspi/Makefile +++ b/sys/boot/arm/at91/bootspi/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../libat91 diff --git a/sys/boot/arm/at91/libat91/Makefile b/sys/boot/arm/at91/libat91/Makefile --- a/sys/boot/arm/at91/libat91/Makefile +++ b/sys/boot/arm/at91/libat91/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include "${.CURDIR}/../Makefile.inc" SOC?=at91rm9200 diff --git a/sys/boot/arm/ixp425/boot2/Makefile b/sys/boot/arm/ixp425/boot2/Makefile --- a/sys/boot/arm/ixp425/boot2/Makefile +++ b/sys/boot/arm/ixp425/boot2/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # We get a lot of the std lib functions from here. .PATH: ${.CURDIR}/../../at91/libat91 diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile --- a/sys/boot/arm/uboot/Makefile +++ b/sys/boot/arm/uboot/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile --- a/sys/boot/i386/Makefile +++ b/sys/boot/i386/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ libi386 libfirewire loader diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no LOADER?= loader diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libstand32/Makefile --- a/sys/boot/libstand32/Makefile +++ b/sys/boot/libstand32/Makefile @@ -8,7 +8,9 @@ MAN= -.include +.include +.include "${SRCTOP}/src.mk" + MK_SSP= no S= ${.CURDIR}/../../../lib/libstand diff --git a/sys/boot/mips/beri/loader/Makefile b/sys/boot/mips/beri/loader/Makefile --- a/sys/boot/mips/beri/loader/Makefile +++ b/sys/boot/mips/beri/loader/Makefile @@ -29,7 +29,8 @@ # # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no PROG?= loader diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile --- a/sys/boot/pc98/loader/Makefile +++ b/sys/boot/pc98/loader/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no LOADER?= loader diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile --- a/sys/boot/powerpc/ofw/Makefile +++ b/sys/boot/powerpc/ofw/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no PROG= loader diff --git a/sys/boot/powerpc/ps3/Makefile b/sys/boot/powerpc/ps3/Makefile --- a/sys/boot/powerpc/ps3/Makefile +++ b/sys/boot/powerpc/ps3/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no PROG= loader.ps3 diff --git a/sys/boot/powerpc/uboot/Makefile b/sys/boot/powerpc/uboot/Makefile --- a/sys/boot/powerpc/uboot/Makefile +++ b/sys/boot/powerpc/uboot/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile --- a/sys/boot/sparc64/loader/Makefile +++ b/sys/boot/sparc64/loader/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no PROG?= loader diff --git a/sys/boot/uboot/lib/Makefile b/sys/boot/uboot/lib/Makefile --- a/sys/boot/uboot/lib/Makefile +++ b/sys/boot/uboot/lib/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../common diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile --- a/sys/boot/userboot/userboot/Makefile +++ b/sys/boot/userboot/userboot/Makefile @@ -2,7 +2,8 @@ MAN= -.include +.include +.include "${SRCTOP}/src.mk" MK_SSP= no SHLIB_NAME= userboot.so diff --git a/sys/modules/Makefile b/sys/modules/Makefile --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR_PARALLEL= diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../dev/aic7xxx KMOD= ahc diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile --- a/sys/modules/carp/Makefile +++ b/sys/modules/carp/Makefile @@ -3,7 +3,8 @@ .PATH: ${.CURDIR}/../../netinet .PATH: ${.CURDIR}/../../crypto -.include +.include +.include "${SRCTOP}/src.mk" KMOD= carp SRCS= ip_carp.c sha1.c diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile --- a/sys/modules/cxgb/Makefile +++ b/sys/modules/cxgb/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= cxgb SUBDIR+= cxgb_t3fw diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile --- a/sys/modules/cxgb/cxgb/Makefile +++ b/sys/modules/cxgb/cxgb/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile --- a/sys/modules/cxgb/iw_cxgb/Makefile +++ b/sys/modules/cxgb/iw_cxgb/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB}/ulp/iw_cxgb diff --git a/sys/modules/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile --- a/sys/modules/cxgb/tom/Makefile +++ b/sys/modules/cxgb/tom/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB}/ulp/tom diff --git a/sys/modules/cxgbe/Makefile b/sys/modules/cxgbe/Makefile --- a/sys/modules/cxgbe/Makefile +++ b/sys/modules/cxgbe/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR = if_cxgbe SUBDIR+= t4_firmware diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile --- a/sys/modules/cxgbe/if_cxgbe/Makefile +++ b/sys/modules/cxgbe/if_cxgbe/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" CXGBE = ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE} ${CXGBE}/common diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile --- a/sys/modules/cxgbe/iw_cxgbe/Makefile +++ b/sys/modules/cxgbe/iw_cxgbe/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" CXGBE = ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE}/iw_cxgbe diff --git a/sys/modules/cxgbe/tom/Makefile b/sys/modules/cxgbe/tom/Makefile --- a/sys/modules/cxgbe/tom/Makefile +++ b/sys/modules/cxgbe/tom/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" CXGBE = ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE}/tom diff --git a/sys/modules/dpt/Makefile b/sys/modules/dpt/Makefile --- a/sys/modules/dpt/Makefile +++ b/sys/modules/dpt/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../dev/dpt KMOD= dpt diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile --- a/sys/modules/drm/Makefile +++ b/sys/modules/drm/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). diff --git a/sys/modules/drm2/Makefile b/sys/modules/drm2/Makefile --- a/sys/modules/drm2/Makefile +++ b/sys/modules/drm2/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include .if ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../netpfil/ipfw KMOD= dummynet diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile --- a/sys/modules/em/Makefile +++ b/sys/modules/em/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_em diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile --- a/sys/modules/ep/Makefile +++ b/sys/modules/ep/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../dev/ep diff --git a/sys/modules/i40e/Makefile b/sys/modules/i40e/Makefile --- a/sys/modules/i40e/Makefile +++ b/sys/modules/i40e/Makefile @@ -1,6 +1,7 @@ #$FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../dev/i40e diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile --- a/sys/modules/if_bridge/Makefile +++ b/sys/modules/if_bridge/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../net KMOD= if_bridge diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 diff --git a/sys/modules/if_lagg/Makefile b/sys/modules/if_lagg/Makefile --- a/sys/modules/if_lagg/Makefile +++ b/sys/modules/if_lagg/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../net KMOD= if_lagg diff --git a/sys/modules/igb/Makefile b/sys/modules/igb/Makefile --- a/sys/modules/igb/Makefile +++ b/sys/modules/igb/Makefile @@ -1,6 +1,7 @@ #$FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_igb diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile --- a/sys/modules/ipdivert/Makefile +++ b/sys/modules/ipdivert/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../netinet diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../contrib/ipfilter/netinet diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../netpfil/ipfw diff --git a/sys/modules/ipoib/Makefile b/sys/modules/ipoib/Makefile --- a/sys/modules/ipoib/Makefile +++ b/sys/modules/ipoib/Makefile @@ -2,7 +2,8 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib .PATH: ${.CURDIR}/../../ofed/include/linux -.include +.include +.include "${SRCTOP}/src.mk" KMOD = ipoib SRCS = device_if.h bus_if.h opt_ofed.h vnode_if.h opt_inet.h opt_inet6.h diff --git a/sys/modules/ixgbe/Makefile b/sys/modules/ixgbe/Makefile --- a/sys/modules/ixgbe/Makefile +++ b/sys/modules/ixgbe/Makefile @@ -1,6 +1,7 @@ #$FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../dev/ixgbe diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile --- a/sys/modules/mlx4/Makefile +++ b/sys/modules/mlx4/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4 -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../ofed/include/linux KMOD = mlx4 diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile --- a/sys/modules/mlx4ib/Makefile +++ b/sys/modules/mlx4ib/Makefile @@ -2,7 +2,8 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4 .PATH: ${.CURDIR}/../../ofed/include/linux -.include +.include +.include "${SRCTOP}/src.mk" KMOD = mlx4ib SRCS = device_if.h bus_if.h pci_if.h vnode_if.h diff --git a/sys/modules/mlxen/Makefile b/sys/modules/mlxen/Makefile --- a/sys/modules/mlxen/Makefile +++ b/sys/modules/mlxen/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4 -.include +.include +.include "${SRCTOP}/src.mk" KMOD = mlxen SRCS = device_if.h bus_if.h pci_if.h vnode_if.h diff --git a/sys/modules/mthca/Makefile b/sys/modules/mthca/Makefile --- a/sys/modules/mthca/Makefile +++ b/sys/modules/mthca/Makefile @@ -2,7 +2,8 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca -.include +.include +.include "${SRCTOP}/src.mk" KMOD = mthca SRCS = device_if.h bus_if.h pci_if.h vnode_if.h diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -1,7 +1,8 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= async \ atm \ diff --git a/sys/modules/netgraph/ipfw/Makefile b/sys/modules/netgraph/ipfw/Makefile --- a/sys/modules/netgraph/ipfw/Makefile +++ b/sys/modules/netgraph/ipfw/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" KMOD= ng_ipfw SRCS= ng_ipfw.c opt_inet.h opt_inet6.h diff --git a/sys/modules/netgraph/netflow/Makefile b/sys/modules/netgraph/netflow/Makefile --- a/sys/modules/netgraph/netflow/Makefile +++ b/sys/modules/netgraph/netflow/Makefile @@ -3,7 +3,8 @@ # Author: Gleb Smirnoff # -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../netgraph/netflow diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../netpfil/pf diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile --- a/sys/modules/pflog/Makefile +++ b/sys/modules/pflog/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../netpfil/pf diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile --- a/sys/modules/pfsync/Makefile +++ b/sys/modules/pfsync/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../netpfil/pf diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile --- a/sys/modules/sound/driver/Makefile +++ b/sys/modules/sound/driver/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -25,7 +25,8 @@ # SUCH DAMAGE. # -.include +.include +.include "${SRCTOP}/src.mk" # # Check for common USB debug flags to pass when building the USB diff --git a/sys/modules/virtio/network/Makefile b/sys/modules/virtio/network/Makefile --- a/sys/modules/virtio/network/Makefile +++ b/sys/modules/virtio/network/Makefile @@ -23,7 +23,8 @@ # SUCH DAMAGE. # -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../dev/virtio/network diff --git a/sys/modules/vmware/vmxnet3/Makefile b/sys/modules/vmware/vmxnet3/Makefile --- a/sys/modules/vmware/vmxnet3/Makefile +++ b/sys/modules/vmware/vmxnet3/Makefile @@ -23,7 +23,8 @@ # SUCH DAMAGE. # -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../dev/vmware/vmxnet3 diff --git a/sys/modules/vx/Makefile b/sys/modules/vx/Makefile --- a/sys/modules/vx/Makefile +++ b/sys/modules/vx/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../dev/vx diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/Makefile b/sys/ofed/drivers/infiniband/hw/mlx4/Makefile --- a/sys/ofed/drivers/infiniband/hw/mlx4/Makefile +++ b/sys/ofed/drivers/infiniband/hw/mlx4/Makefile @@ -2,7 +2,8 @@ #.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4 #.PATH: ${.CURDIR}/../../../../include/linux -.include +.include +.include "${SRCTOP}/src.mk" KMOD = mlx4ib SRCS = device_if.h bus_if.h pci_if.h vnode_if.h diff --git a/sys/ofed/drivers/net/mlx4/Makefile b/sys/ofed/drivers/net/mlx4/Makefile --- a/sys/ofed/drivers/net/mlx4/Makefile +++ b/sys/ofed/drivers/net/mlx4/Makefile @@ -2,7 +2,8 @@ #.PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4:${.CURDIR}/../../ofed/include/linux .PATH: ${.CURDIR}/../../../../../include/linux -.include +.include +.include "${SRCTOP}/src.mk" KMOD = mlx4 diff --git a/tools/regression/priv/Makefile b/tools/regression/priv/Makefile --- a/tools/regression/priv/Makefile +++ b/tools/regression/priv/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" PROG= priv SRCS= main.c \ diff --git a/tools/tools/net80211/wlanwatch/Makefile b/tools/tools/net80211/wlanwatch/Makefile --- a/tools/tools/net80211/wlanwatch/Makefile +++ b/tools/tools/net80211/wlanwatch/Makefile @@ -4,7 +4,8 @@ PROG= wlanwatch BINDIR= /usr/local/bin MAN= -.include +.include +.include "${SRCTOP}/src.mk" .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 diff --git a/usr.bin/Makefile b/usr.bin/Makefile --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc --- a/usr.bin/Makefile.inc +++ b/usr.bin/Makefile.inc @@ -1,6 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include "${SRCTOP}/src.mk" + BINDIR?= /usr/bin WARNS?= 6 diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= apply DPADD= ${LIBSBUF} diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ar SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.sinclude +.sinclude "${SRCTOP}/src.mk" .if defined(.PARSEDIR) # make sure this is available to unit-tests/Makefile diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/usr.bin/chkey/Makefile +++ b/usr.bin/chkey/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../newkey diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= clang clang-tblgen tblgen diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG_CXX=clang diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile --- a/usr.bin/comm/Makefile +++ b/usr.bin/comm/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= comm diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= fetch CSTD?= c99 diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile --- a/usr.bin/file2c/Makefile +++ b/usr.bin/file2c/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= file2c diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -2,7 +2,8 @@ # $NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $ # from: @(#)Makefile 8.2 (Berkeley) 4/3/94 -.include +.include +.include "${SRCTOP}/src.mk" # Uncomment the following to provide defaults for gate-ftp operation # diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ -.include +.include +.include "${SRCTOP}/src.mk" .if ${MK_BSD_GREP} == "yes" PROG= grep diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile --- a/usr.bin/gzip/Makefile +++ b/usr.bin/gzip/Makefile @@ -1,7 +1,8 @@ # $NetBSD: Makefile,v 1.16 2011/06/21 13:25:45 joerg Exp $ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/usr.bin/id/Makefile +++ b/usr.bin/id/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= id LINKS= ${BINDIR}/id ${BINDIR}/groups diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile --- a/usr.bin/join/Makefile +++ b/usr.bin/join/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -.include +.include +.include "${SRCTOP}/src.mk" PROG= join diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile --- a/usr.bin/jot/Makefile +++ b/usr.bin/jot/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= jot diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .if (${MACHINE_ARCH} == "amd64") SFX= 32 diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile --- a/usr.bin/lastcomm/Makefile +++ b/usr.bin/lastcomm/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= lastcomm SRCS= lastcomm.c readrec.c diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../contrib/flex diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile --- a/usr.bin/logger/Makefile +++ b/usr.bin/logger/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= logger diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= login SRCS= login.c login_fbtab.c diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile --- a/usr.bin/m4/Makefile +++ b/usr.bin/m4/Makefile @@ -4,7 +4,8 @@ # -DEXTENDED # if you want the paste & spaste macros. -.include +.include +.include "${SRCTOP}/src.mk" PROG= m4 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -2,7 +2,8 @@ # $Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= make CFLAGS+=-I${.CURDIR} diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile --- a/usr.bin/ncal/Makefile +++ b/usr.bin/ncal/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ncal diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/12/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/usr.bin/newkey/Makefile +++ b/usr.bin/newkey/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= newkey SRCS= newkey.c generic.c update.c diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG = passwd BINOWN = root diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile --- a/usr.bin/printf/Makefile +++ b/usr.bin/printf/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= printf diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile --- a/usr.bin/sed/Makefile +++ b/usr.bin/sed/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= sed SRCS= compile.c main.c misc.c process.c diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= sort diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= su diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc --- a/usr.bin/svn/Makefile.inc +++ b/usr.bin/svn/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${SRCTOP}/src.mk" .if ${MK_SVN} == "yes" SVNLITE?= diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile --- a/usr.bin/svn/lib/libapr_util/Makefile +++ b/usr.bin/svn/lib/libapr_util/Makefile @@ -28,7 +28,8 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${APR}/include/arch/unix \ -I${APR}/include -.include +.include +.include "${SRCTOP}/src.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 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.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 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/telnet diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile --- a/usr.bin/tr/Makefile +++ b/usr.bin/tr/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= tr SRCS= cmap.c cset.c str.c tr.c diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile --- a/usr.bin/uudecode/Makefile +++ b/usr.bin/uudecode/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= uudecode LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile --- a/usr.bin/uuencode/Makefile +++ b/usr.bin/uuencode/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= uuencode MAN= uuencode.1 uuencode.format.5 diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" SRCDIR= ${.CURDIR}/../../contrib/nvi SUBDIR+= catalog diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= xargs SRCS= xargs.c strnsubst.c diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 5.3 (Berkeley) 5/12/90 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" BYACC_SRC= ${.CURDIR}/../../contrib/byacc .PATH: ${BYACC_SRC} diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,7 +1,8 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SUBDIR= adduser \ arp \ diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc --- a/usr.sbin/Makefile.inc +++ b/usr.sbin/Makefile.inc @@ -1,6 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include "${SRCTOP}/src.mk" + BINDIR?= /usr/sbin WARNS?= 6 diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc --- a/usr.sbin/amd/Makefile.inc +++ b/usr.sbin/amd/Makefile.inc @@ -9,7 +9,7 @@ # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ -.include +.include "${SRCTOP}/src.mk" CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -6,7 +6,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../contrib/amd/amd diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile --- a/usr.sbin/amd/include/Makefile +++ b/usr.sbin/amd/include/Makefile @@ -7,7 +7,8 @@ # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ -.include +.include +.include "${SRCTOP}/src.mk" SRCS= config_local.h .if ${MK_NIS} == "no" diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile --- a/usr.sbin/bootparamd/bootparamd/Makefile +++ b/usr.sbin/bootparamd/bootparamd/Makefile @@ -1,7 +1,8 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= bootparamd MAN= bootparams.5 bootparamd.8 diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile --- a/usr.sbin/bsnmpd/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/bsnmpd/Makefile @@ -2,7 +2,8 @@ # # Author: Harti Brandt -.include +.include +.include "${SRCTOP}/src.mk" CONTRIB=${.CURDIR}/../../../contrib/bsnmp .PATH: ${CONTRIB}/snmpd diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile --- a/usr.sbin/bsnmpd/modules/Makefile +++ b/usr.sbin/bsnmpd/modules/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile --- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../../sbin/hastd diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile --- a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile +++ b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ # Author: Shteryana Shopova -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR} diff --git a/usr.sbin/etcupdate/Makefile b/usr.sbin/etcupdate/Makefile --- a/usr.sbin/etcupdate/Makefile +++ b/usr.sbin/etcupdate/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SCRIPTS=etcupdate.sh MAN= etcupdate.8 diff --git a/usr.sbin/flowctl/Makefile b/usr.sbin/flowctl/Makefile --- a/usr.sbin/flowctl/Makefile +++ b/usr.sbin/flowctl/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ # -.include +.include +.include "${SRCTOP}/src.mk" PROG= flowctl MAN= flowctl.8 diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile --- a/usr.sbin/gssd/Makefile +++ b/usr.sbin/gssd/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= gssd MAN= gssd.8 diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile --- a/usr.sbin/ifmcstat/Makefile +++ b/usr.sbin/ifmcstat/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ifmcstat SRCS= ifmcstat.c printb.c diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= inetd MAN= inetd.8 diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= jail MAN= jail.8 jail.conf.5 diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile --- a/usr.sbin/jls/Makefile +++ b/usr.sbin/jls/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= jls MAN= jls.8 diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc --- a/usr.sbin/lpr/Makefile.inc +++ b/usr.sbin/lpr/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${SRCTOP}/src.mk" .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .if ${MK_MAILWRAPPER} != "no" PROG= mailwrapper diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile --- a/usr.sbin/mtest/Makefile +++ b/usr.sbin/mtest/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= mtest MAN= mtest.8 diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= newsyslog MAN= newsyslog.8 newsyslog.conf.5 diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile --- a/usr.sbin/ngctl/Makefile +++ b/usr.sbin/ngctl/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ngctl MAN= ngctl.8 diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${SRCTOP}/src.mk" DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H NTPDEFS= -DSYS_FREEBSD diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile --- a/usr.sbin/ntp/doc/Makefile +++ b/usr.sbin/ntp/doc/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" FILESDIR= ${SHAREDIR}/doc/ntp diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -2,7 +2,8 @@ MAN= -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../../contrib/ntp/util \ ${.CURDIR}/../../../contrib/ntp/ntpd diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -2,7 +2,8 @@ MAN= -.include +.include +.include "${SRCTOP}/src.mk" NO_PIE= yes diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= ppp MAN= ppp.8 diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile --- a/usr.sbin/rpcbind/Makefile +++ b/usr.sbin/rpcbind/Makefile @@ -1,7 +1,8 @@ # $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= rpcbind MAN= rpcbind.8 diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile --- a/usr.sbin/sa/Makefile +++ b/usr.sbin/sa/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../usr.bin/lastcomm diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.8 (Berkeley) 3/28/97 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail SMDIR= ${SENDMAIL_DIR}/src diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../usr.bin/wall diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile --- a/usr.sbin/tcpdchk/Makefile +++ b/usr.sbin/tcpdchk/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../contrib/tcp_wrappers diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile --- a/usr.sbin/tcpdmatch/Makefile +++ b/usr.sbin/tcpdmatch/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .PATH: ${.CURDIR}/../../contrib/tcp_wrappers diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump .PATH: ${TCPDUMP_DISTDIR} diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile --- a/usr.sbin/trpt/Makefile +++ b/usr.sbin/trpt/Makefile @@ -1,7 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" PROG= trpt MAN= trpt.8 diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include "${.CURDIR}/../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} \ diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -.include +.include +.include "${SRCTOP}/src.mk" .include "${.CURDIR}/../Makefile.inc"