From: Thomas Walker Lynch Date: Wed, 11 Nov 2026 08:49:39 +0000 (+0000) Subject: updates project makefile name X-Git-Url: https://git.reasoningtechnology.com/?a=commitdiff_plain;h=bf1c03f732b6dd185230f6f5fbd3c1d7e391d893;p=Account-Tree updates project makefile name --- diff --git a/developer/authored/AccountTree_gate.make/AccountTree_gate.make b/developer/authored/AccountTree_gate.make/AccountTree_gate.make new file mode 120000 index 0000000..f559a5c --- /dev/null +++ b/developer/authored/AccountTree_gate.make/AccountTree_gate.make @@ -0,0 +1 @@ +../../../shared/project-dependency/Man_In_Grey/Man_In_Grey_gate/Man_In_Grey_gate.mk \ No newline at end of file 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/makefile deleted file mode 100644 index ed4ec4a..0000000 --- a/developer/tool/build_component/makefile +++ /dev/null @@ -1,20 +0,0 @@ -# developer/tool/build_component/makefile -# -# 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 -# namespace's *.mk files, which have the last say. This file holds settings, -# not rules for building: Harmony.mk has those. -# -# Add to a default with +=, replace one with :=, for example: -# -# CFLAGS += -O2 -# LN_FLAGS += -lm -# -# Settings for one namespace go in a .mk file beside its source instead, such -# as authored/.make/.mk. That file is also staged and -# promoted with the namespace's library, so a project built against the -# library reads the same settings. -# -# Harmony.mk's information and clean are double-colon rules, so a recipe -# added here as 'information::' or 'clean::' runs as well as Harmony.mk's. -# Make runs them in the order it read them, so this file's runs first. diff --git a/developer/tool/build_component/project.mk b/developer/tool/build_component/project.mk new file mode 100644 index 0000000..a362ead --- /dev/null +++ b/developer/tool/build_component/project.mk @@ -0,0 +1,20 @@ +# 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 +# namespace's *.mk files, which have the last say. This file holds settings, +# not rules for building: Harmony.mk has those. +# +# Add to a default with +=, replace one with :=, for example: +# +# CFLAGS += -O2 +# LN_FLAGS += -lm +# +# Settings for one namespace go in a .mk file beside its source instead, such +# as authored/.make/.mk. That file is also staged and +# promoted with the namespace's library, so a project built against the +# library reads the same settings. +# +# Harmony.mk's information and clean are double-colon rules, so a recipe +# added here as 'information::' or 'clean::' runs as well as Harmony.mk's. +# Make runs them in the order it read them, so this file's runs first. 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