Date: Sat, 19 Apr 2025 19:58:00 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: cf5f0744cd1d - main - Add .NOTMAIN to guard targets Message-ID: <202504191958.53JJw0QX085516@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cf5f0744cd1df70f92959710bdf2a88c9f9c7df7 commit cf5f0744cd1df70f92959710bdf2a88c9f9c7df7 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2025-04-19 19:57:41 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2025-04-19 19:57:41 +0000 Add .NOTMAIN to guard targets Avoid make mistaking a guard target for the .MAIN one. --- share/mk/bsd.clang-analyze.mk | 2 +- share/mk/bsd.compat.mk | 2 +- share/mk/bsd.compat.pre.mk | 2 +- share/mk/bsd.compiler.mk | 2 +- share/mk/bsd.confs.mk | 2 +- share/mk/bsd.dirs.mk | 2 +- share/mk/bsd.files.mk | 2 +- share/mk/bsd.init.mk | 2 +- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.linker.mk | 2 +- share/mk/bsd.obj.mk | 2 +- share/mk/bsd.opts.mk | 2 +- share/mk/bsd.own.mk | 2 +- share/mk/bsd.subdir.mk | 2 +- share/mk/bsd.symver.mk | 2 +- share/mk/bsd.test.mk | 2 +- share/mk/local.dirdeps.mk | 2 +- share/mk/local.init.mk | 2 +- share/mk/netbsd-tests.test.mk | 2 +- share/mk/src.init.mk | 2 +- share/mk/src.libnames.mk | 2 +- share/mk/src.lua.mk | 2 +- share/mk/src.opts.mk | 2 +- share/mk/src.tools.mk | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/share/mk/bsd.clang-analyze.mk b/share/mk/bsd.clang-analyze.mk index 474d2d1e8166..8a49670df573 100644 --- a/share/mk/bsd.clang-analyze.mk +++ b/share/mk/bsd.clang-analyze.mk @@ -25,7 +25,7 @@ # output on stdout. .if !target(__<bsd.clang-analyze.mk>__) -__<bsd.clang-analyze.mk>__: +__<bsd.clang-analyze.mk>__: .NOTMAIN .include <bsd.compiler.mk> diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index c41cfda5f01c..6fa732fd730b 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -1,6 +1,6 @@ .if !targets(__<${_this:T}>__) -__<${_this:T}>__: +__<${_this:T}>__: .NOTMAIN .include <bsd.compat.pre.mk> diff --git a/share/mk/bsd.compat.pre.mk b/share/mk/bsd.compat.pre.mk index 05bdcb8a9f45..92ff6013c040 100644 --- a/share/mk/bsd.compat.pre.mk +++ b/share/mk/bsd.compat.pre.mk @@ -1,5 +1,5 @@ .if !targets(__<${_this:T}>__) -__<${_this:T}>__: +__<${_this:T}>__: .NOTMAIN _ALL_LIBCOMPATS:= 32 diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk index f93d3495b1aa..e8d48cf0b5bf 100644 --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -40,7 +40,7 @@ # .if !target(__<bsd.compiler.mk>__) -__<bsd.compiler.mk>__: +__<bsd.compiler.mk>__: .NOTMAIN .include <bsd.opts.mk> diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index c4fb62782b75..ea702cece28d 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -8,7 +8,7 @@ . error bsd.dirs.mk must be included after bsd.confs.mk. . endif -__<bsd.confs.mk>__: +__<bsd.confs.mk>__: .NOTMAIN CONFGROUPS?= CONFS diff --git a/share/mk/bsd.dirs.mk b/share/mk/bsd.dirs.mk index 8e090d3f2cbd..317ff61cd604 100644 --- a/share/mk/bsd.dirs.mk +++ b/share/mk/bsd.dirs.mk @@ -2,7 +2,7 @@ # Directory permissions management. .if !target(__<bsd.dirs.mk>__) -__<bsd.dirs.mk>__: +__<bsd.dirs.mk>__: .NOTMAIN # List of directory variable names to install. Each variable name's value # must be a full path. If non-default permissions are desired, <DIR>_MODE, # <DIR>_OWN, and <DIR>_GRP may be specified. diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index a330a8dddbbd..aedc414d6a28 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -8,7 +8,7 @@ .error bsd.dirs.mk must be included after bsd.files.mk. .endif -__<bsd.files.mk>__: +__<bsd.files.mk>__: .NOTMAIN FILESGROUPS?= FILES diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk index 64fdd23ce7ad..4d3acc3a1148 100644 --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -6,7 +6,7 @@ # MK_FOO variables. .if !target(__<bsd.init.mk>__) -__<bsd.init.mk>__: +__<bsd.init.mk>__: .NOTMAIN .include <bsd.opts.mk> .-include "local.init.mk" diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index d6e271ce0a06..b33366604b4c 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -4,7 +4,7 @@ .include <bsd.linker.mk> .include <bsd.compat.pre.mk> -__<bsd.lib.mk>__: +__<bsd.lib.mk>__: .NOTMAIN .if defined(LIB_CXX) || defined(SHLIB_CXX) _LD= ${CXX} diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk index cceeadd05b94..95d98231b641 100644 --- a/share/mk/bsd.linker.mk +++ b/share/mk/bsd.linker.mk @@ -25,7 +25,7 @@ # .if !target(__<bsd.linker.mk>__) -__<bsd.linker.mk>__: +__<bsd.linker.mk>__: .NOTMAIN _ld_vars=LD $${_empty_var_} .if !empty(_WANT_TOOLCHAIN_CROSS_VARS) diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 578423914c6b..91dac6805b12 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -38,7 +38,7 @@ # .if !target(__<bsd.obj.mk>__) -__<bsd.obj.mk>__: +__<bsd.obj.mk>__: .NOTMAIN .include <bsd.own.mk> # This is also done in bsd.init.mk diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index f79c5bc61a20..a9400186f78a 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -30,7 +30,7 @@ # .if !target(__<bsd.opts.mk>__) -__<bsd.opts.mk>__: +__<bsd.opts.mk>__: .NOTMAIN .if !defined(_WITHOUT_SRCCONF) # diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index bc53f3679e77..0c47ba9af5c4 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -146,7 +146,7 @@ # SYMLINKMODE Symbolic link mode [755] .if !target(__<bsd.own.mk>__) -__<bsd.own.mk>__: +__<bsd.own.mk>__: .NOTMAIN .include <bsd.opts.mk> # options now here or src.opts.mk diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 565af41602c0..cf19c9d66201 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -33,7 +33,7 @@ # .if !target(__<bsd.subdir.mk>__) -__<bsd.subdir.mk>__: +__<bsd.subdir.mk>__: .NOTMAIN .if ${MK_AUTO_OBJ} == "no" _obj= obj diff --git a/share/mk/bsd.symver.mk b/share/mk/bsd.symver.mk index d0b63206d8fe..7a46f67e6774 100644 --- a/share/mk/bsd.symver.mk +++ b/share/mk/bsd.symver.mk @@ -1,6 +1,6 @@ .if !target(__<bsd.symver.mk>__) -__<bsd.symver.mk>__: +__<bsd.symver.mk>__: .NOTMAIN .include <bsd.init.mk> diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index ea7bda0da559..b324ac173335 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -7,7 +7,7 @@ .include <bsd.init.mk> -__<bsd.test.mk>__: +__<bsd.test.mk>__: .NOTMAIN # Third-party software (kyua, etc) prefix. LOCALBASE?= /usr/local diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 2a92eea7455e..f34a4542e534 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -40,7 +40,7 @@ DIRDEPS_FILTER.host = \ # since they are never installed. # Cheat for including src.libnames.mk -__<bsd.init.mk>__: +__<bsd.init.mk>__: .NOTMAIN # Pull in _INTERNALLIBS .include <src.libnames.mk> diff --git a/share/mk/local.init.mk b/share/mk/local.init.mk index 758a3604d73a..7ea513385f61 100644 --- a/share/mk/local.init.mk +++ b/share/mk/local.init.mk @@ -1,6 +1,6 @@ .if !target(__${_this}__) -__${_this}__: +__${_this}__: .NOTMAIN .if ${.MAKE.MODE:Mmeta*} != "" .if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) && ${.MAKE.MAKEFILES:M*bsd.prog.mk} == "" diff --git a/share/mk/netbsd-tests.test.mk b/share/mk/netbsd-tests.test.mk index 4f222faca2ab..bed01156c5e5 100644 --- a/share/mk/netbsd-tests.test.mk +++ b/share/mk/netbsd-tests.test.mk @@ -1,6 +1,6 @@ .if !target(__netbsd_tests.test.mk__) -__netbsd_tests.test.mk__: +__netbsd_tests.test.mk__: .NOTMAIN TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H} diff --git a/share/mk/src.init.mk b/share/mk/src.init.mk index e35d615d0e1a..01ea5437e5a7 100644 --- a/share/mk/src.init.mk +++ b/share/mk/src.init.mk @@ -1,6 +1,6 @@ .if !target(__<src.init.mk>__) -__<src.init.mk>__: +__<src.init.mk>__: .NOTMAIN .if !target(buildenv) buildenv: .PHONY diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index be8db2dc1540..57b694ed5122 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -7,7 +7,7 @@ .endif .if !target(__<src.libnames.mk>__) -__<src.libnames.mk>__: +__<src.libnames.mk>__: .NOTMAIN .include <src.opts.mk> diff --git a/share/mk/src.lua.mk b/share/mk/src.lua.mk index 7d8bc05fdfcf..063ca97ea7d2 100644 --- a/share/mk/src.lua.mk +++ b/share/mk/src.lua.mk @@ -5,7 +5,7 @@ # system. .if !target(__<src.lua.mk>__) -__<src.lua.mk>__: +__<src.lua.mk>__: .NOTMAIN .include <bsd.own.mk> diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index ef8711db713f..956220be43b3 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -29,7 +29,7 @@ # .if !target(__<src.opts.mk>__) -__<src.opts.mk>__: +__<src.opts.mk>__: .NOTMAIN .include <bsd.own.mk> diff --git a/share/mk/src.tools.mk b/share/mk/src.tools.mk index 23012593222b..70053c9b4a32 100644 --- a/share/mk/src.tools.mk +++ b/share/mk/src.tools.mk @@ -21,5 +21,5 @@ SERVICES_MKDB_CMD?= services_mkdb CAP_MKDB_CMD?= cap_mkdb TIC_CMD?= tic -__<src.tools.mk>__: +__<src.tools.mk>__: .NOTMAIN .endif # !target(__<tools>__)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504191958.53JJw0QX085516>