Date: Wed, 30 Aug 2023 14:47:25 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: 61fe0b8e94a7 - main - Add sys.dirdeps.mk to share/mk FILES Message-ID: <202308301447.37UElPje077527@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=61fe0b8e94a75bced6d68e44ed3c3971132b66e1 commit 61fe0b8e94a75bced6d68e44ed3c3971132b66e1 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2023-08-30 14:46:08 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2023-08-30 14:46:08 +0000 Add sys.dirdeps.mk to share/mk FILES A few recent makefiles should have been added to FILES. Rename sys.machine.mk to local.sys.machine.mk as it is very tree specific so does not belong in /usr/share/mk/ Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D41642 --- share/mk/Makefile | 4 ++++ share/mk/local.sys.env.mk | 2 +- share/mk/{sys.machine.mk => local.sys.machine.mk} | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/share/mk/Makefile b/share/mk/Makefile index 1663b787c662..2597ac5b2072 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -60,8 +60,11 @@ FILES= \ bsd.test.mk \ dirdeps.mk \ dirdeps-options.mk \ + dirdeps-targets.mk \ gendirdeps.mk \ + host-target.mk \ install-new.mk \ + jobs.mk \ meta.autodep.mk \ meta.stage.mk \ meta.subdir.mk \ @@ -70,6 +73,7 @@ FILES= \ stage-install.sh \ sys.mk \ sys.dependfile.mk \ + sys.dirdeps.mk \ version_gen.awk FILESDIR= ${BINDIR}/mk diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk index c87a4b7dcf71..71a46f122bf4 100644 --- a/share/mk/local.sys.env.mk +++ b/share/mk/local.sys.env.mk @@ -56,4 +56,4 @@ ECHO_TRACE?= true .export HOST_TARGET .endif -.include <sys.machine.mk> +.include <local.sys.machine.mk> diff --git a/share/mk/sys.machine.mk b/share/mk/local.sys.machine.mk similarity index 94% rename from share/mk/sys.machine.mk rename to share/mk/local.sys.machine.mk index 716dd17d5cce..fc801a7cd11c 100644 --- a/share/mk/sys.machine.mk +++ b/share/mk/local.sys.machine.mk @@ -1,5 +1,5 @@ -.-include <local.sys.machine.mk> +.-include <site.sys.machine.mk> PSEUDO_MACHINE_LIST?= common host TARGET_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308301447.37UElPje077527>