diff options
author | imp <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
commit | 2118f42afd6189d38de35003e029021c0917f7e8 (patch) | |
tree | feab560c7ac78d6da6d5e59636d346110d120bd7 /share | |
parent | 726190bef76155e04b90d525e540ce41474dddd5 (diff) | |
download | FreeBSD-src-2118f42afd6189d38de35003e029021c0917f7e8.zip FreeBSD-src-2118f42afd6189d38de35003e029021c0917f7e8.tar.gz |
Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
Diffstat (limited to 'share')
-rw-r--r-- | share/Makefile | 2 | ||||
-rw-r--r-- | share/doc/Makefile | 2 | ||||
-rw-r--r-- | share/doc/smm/Makefile | 2 | ||||
-rw-r--r-- | share/dtrace/Makefile | 2 | ||||
-rw-r--r-- | share/examples/Makefile | 2 | ||||
-rw-r--r-- | share/man/Makefile | 2 | ||||
-rw-r--r-- | share/man/man1/Makefile | 2 | ||||
-rw-r--r-- | share/man/man3/Makefile | 2 | ||||
-rw-r--r-- | share/man/man4/Makefile | 2 | ||||
-rw-r--r-- | share/man/man5/Makefile | 2 | ||||
-rw-r--r-- | share/mk/Makefile | 4 | ||||
-rw-r--r-- | share/mk/bsd.opts.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 5 | ||||
-rw-r--r-- | share/mk/src.opts.mk | 5 |
14 files changed, 20 insertions, 16 deletions
diff --git a/share/Makefile b/share/Makefile index 8ac4750..604e416 100644 --- a/share/Makefile +++ b/share/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> # Do not include `info' in the SUBDIR list, it is handled separately. diff --git a/share/doc/Makefile b/share/doc/Makefile index a4fe61d..fda977f 100644 --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_IPv6} \ ${_atf} \ diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile index fd42bd4..1d99b05 100644 --- a/share/doc/smm/Makefile +++ b/share/doc/smm/Makefile @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/10/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> # The following modules do not describe FreeBSD: # 14.uucpimpl, 15.uucpnet diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile index adbdc84..ba52997 100644 --- a/share/dtrace/Makefile +++ b/share/dtrace/Makefile @@ -4,7 +4,7 @@ # the DTraceToolkit. # -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_toolkit} diff --git a/share/examples/Makefile b/share/examples/Makefile index a4270bf..dcc3256 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -2,7 +2,7 @@ # # Doing a make install builds /usr/share/examples -.include <bsd.own.mk> +.include <src.opts.mk> LDIRS= BSD_daemon \ FreeBSD_version \ diff --git a/share/man/Makefile b/share/man/Makefile index 524235c..c3bd5f2 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/16/94 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.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 index 97885a6..1b37c4b 100644 --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MAN= builtin.1 intro.1 diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index ccdc549..f0cbf0e 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MAN= assert.3 \ ATOMIC_VAR_INIT.3 \ diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index f69c862..5d2ee5f 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MAN= aac.4 \ aacraid.4 \ diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index e0bd222..541f211 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> #MISSING: dump.5 plot.5 MAN= acct.5 \ diff --git a/share/mk/Makefile b/share/mk/Makefile index cd10215..f6f6e98 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -.include <bsd.own.mk> +.include <src.opts.mk> FILES= \ bsd.README \ @@ -26,7 +26,7 @@ FILES= \ bsd.nls.mk \ bsd.obj.mk \ bsd.opts.mk \ - bsd.own.mk \ + src.opts.mk \ bsd.port.mk \ bsd.port.options.mk \ bsd.port.post.mk \ diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 50c3092..09b607e 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -65,8 +65,6 @@ __DEFAULT_NO_OPTIONS = \ .include <bsd.mkopt.mk> -# This should be elsewhere, but needs to be here first for now. -.include <src.opts.mk> .endif # !_WITHOUT_SRCCONF .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 3105cd6..952ca21 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,6 +1,6 @@ # $FreeBSD$ # -# The include file <bsd.own.mk> set common variables for owner, +# The include file <src.opts.mk> set common variables for owner, # group, mode, and directories. Defaults are in brackets. # # @@ -234,4 +234,7 @@ COMPRESS_EXT?= .gz # overriden by Makefiles, but the user may choose to set this in src.conf(5). TESTSBASE?= /usr/tests +# Compat for the moment +.include <bsd.compiler.mk> + .endif # !target(__<bsd.own.mk>__) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index e8a6e00..2b0d41f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -14,7 +14,7 @@ # Makefiles must include bsd.srcpot.mk before they test the value of any MK_FOO # variable. # -# Makefiles may also assume that this file is included by bsd.own.mk should it +# Makefiles may also assume that this file is included by src.opts.mk should it # need variables defined there prior to the end of the Makefile where # bsd.{subdir,lib.bin}.mk is traditionally included. # @@ -30,6 +30,9 @@ .if !target(__<src.opts.mk>__) __<src.opts.mk>__: +# Compat -- needed still? +.include <bsd.own.mk> + # Allow user to configure things, but in the future this will move # elsehwere... |