From 719d1eebcbc3e1ff0bbbcff933cef872ab318fbd Mon Sep 17 00:00:00 2001 From: Thomas Walker Lynch Date: Wed, 11 Nov 2026 08:50:04 +0000 Subject: [PATCH] updates project makefile name --- developer/tool/build_component/make | 2 +- developer/tool/build_component/{makefile => project.mk} | 2 +- shared/tool/makefile/Harmony.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename developer/tool/build_component/{makefile => project.mk} (95%) diff --git a/developer/tool/build_component/make b/developer/tool/build_component/make index 82df53f..833c27c 100755 --- a/developer/tool/build_component/make +++ b/developer/tool/build_component/make @@ -12,6 +12,6 @@ export KMOD_SOURCE_DIR="authored/$NAMESPACE_DIR" export LIBRARY_DIR="scratchpad/made/$NAMESPACE" export MACHINE_DIR="scratchpad/made/$NAMESPACE" -# Harmony.mk is the makefile run; it includes tool/build_component/makefile, +# Harmony.mk is the makefile run; it includes tool/build_component/project.mk, # the project's settings, and the namespace's *.mk files. /bin/make -f "$REPO_HOME/shared/tool/makefile/Harmony.mk" "$CMD" diff --git a/developer/tool/build_component/makefile b/developer/tool/build_component/project.mk similarity index 95% rename from developer/tool/build_component/makefile rename to developer/tool/build_component/project.mk index ed4ec4a..a362ead 100644 --- a/developer/tool/build_component/makefile +++ b/developer/tool/build_component/project.mk @@ -1,4 +1,4 @@ -# developer/tool/build_component/makefile +# developer/tool/build_component/project.mk # # The project's make settings, for every namespace the project builds with # make. Harmony.mk includes this file after its own defaults and before the diff --git a/shared/tool/makefile/Harmony.mk b/shared/tool/makefile/Harmony.mk index 2f95a03..58aab0d 100644 --- a/shared/tool/makefile/Harmony.mk +++ b/shared/tool/makefile/Harmony.mk @@ -6,7 +6,7 @@ # what the layers before it set: # # 1. Harmony's defaults, in this file -# 2. the project's settings, tool/build_component/makefile +# 2. the project's settings, tool/build_component/project.mk # 3. the namespace's settings, any *.mk beside its source # # A layer adds to a default with += and replaces one with :=. The flags the @@ -55,7 +55,7 @@ KMOD_OUTPUT_DIR ?= scratchpad/kmod #-------------------------------------------------------------------------------- # 2. the project's settings -include tool/build_component/makefile +include tool/build_component/project.mk #-------------------------------------------------------------------------------- # 3. the namespace's settings -- 2.20.1