.

diff --git a/developer/make/environment_RT_0 b/developer/make/environment_RT_0
index ad4e617..39fb998 100644 (file)
--- a/developer/make/environment_RT_0
+++ b/developer/make/environment_RT_0
@@ -13,7 +13,7 @@ ECHO := printf "%b\n"
 SRCDIR_List=cc
 
 LIBDIR=scratchpad
-EXECDIR=machine
+EXECDIR=scratchpad
 TMPDIR=scratchpad
 
 DEPFILE=$(TMPDIR)/makefile-cc.deps

diff --git a/developer/make/environment_RT_1.mk b/developer/make/environment_RT_1.mk
index 13368e1..84eb5db 100644 (file)
--- a/developer/make/environment_RT_1.mk
+++ b/developer/make/environment_RT_1.mk
@@ -1,6 +1,5 @@
 # makefile environment variable defaults.
-#  cc is the name of the C compiler
-#  <name>.c is C source code.
+#  cc is the name of the C compiler, a file called <name>.c is C source code.
 
 SHELL=/bin/bash
 
@@ -11,10 +10,10 @@ ECHO := printf "%b\n"
 
 # sources found in these subdirectories:
 SRCDIR_LIST=cc
-LIBDIR     := $(SCRATCHPAD)
+LIBDIR     := scratchpad
 LIBFILE    := $(LIBDIR)/lib.a
 LINKFLAGS  := -L$(LIBDIR) -L/lib64 -L/lib
-EXECDIR    := $(SCRATCHPAD)
+EXECDIR    := scratchpad
 
 C=gcc
 CFLAGS=-std=gnu11 -Wall -Wextra -Wpedantic -finput-charset=UTF-8

diff --git a/developer/make/target_kmod.mk b/developer/make/target_kmod.mk
index 9442c0d..d24269d 100644 (file)
--- a/developer/make/target_kmod.mk
+++ b/developer/make/target_kmod.mk
@@ -1,18 +1,29 @@
-.SUFFIXES:
 # make/target_kmod.mk — build *.kmod.c as kernel modules (single-pass, kmod-only)
 # invoked from $REPO_HOME/<role>
-# version 1.2
+# version 1.4
+
+.SUFFIXES:
+.EXPORT_ALL_VARIABLES:
 
 SOURCE_DIR  := cc
 BUILD_DIR   := /lib/modules/$(shell uname -r)/build
-# Isolate per-kernel output (safe) or collapse to 'scratchpad/kmod' (simpler)
-OUTPUT_DIR  := $(abspath scratchpad/kmod/$(shell uname -r))
+OUTPUT_DIR  := $(abspath scratchpad/kmod)   # dedicated kmod staging/build dir
 
-# authored module basenames (without .kmod.c) — kmod-only
+# authored basenames (without suffix)
 BASE_LIST   := $(patsubst %.kmod.c,%,$(notdir $(wildcard $(SOURCE_DIR)/*.kmod.c)))
 
-# prepared sources under OUTPUT_DIR (Kbuild expects sources under M)
-ALL_C       := $(addsuffix .c,$(addprefix $(OUTPUT_DIR)/,$(BASE_LIST)))
+# optional library sources (without suffix) to include inside modules
+# set KMOD_INCLUDE_LIB=0 to disable
+KMOD_INCLUDE_LIB ?= 1
+ifeq ($(KMOD_INCLUDE_LIB),1)
+LIB_BASE   := $(patsubst %.lib.c,%,$(notdir $(wildcard $(SOURCE_DIR)/*.lib.c)))
+else
+LIB_BASE   :=
+endif
+
+# staged sources (kept namespaced to prevent .o collisions)
+ALL_KMOD_C  := $(addsuffix .kmod.c,$(addprefix $(OUTPUT_DIR)/,$(BASE_LIST)))
+ALL_LIB_C   := $(addsuffix .lib.c,$(addprefix $(OUTPUT_DIR)/,$(LIB_BASE)))
 
 .PHONY: usage
 usage:
@@ -20,7 +31,7 @@ usage:
 
 .PHONY: version
 version:
-       @echo target_kmod version 1.2
+       @echo target_kmod version 1.4
 
 .PHONY: information
 information:
@@ -28,9 +39,11 @@ information:
        @echo "BUILD_DIR:    " $(BUILD_DIR)
        @echo "OUTPUT_DIR:   " $(OUTPUT_DIR)
        @echo "BASE_LIST:    " $(BASE_LIST)
-       @echo "ALL_C:        " $(ALL_C)
+       @echo "LIB_BASE:     " $(LIB_BASE)
+       @echo "ALL_KMOD_C:   " $(ALL_KMOD_C)
+       @echo "ALL_LIB_C:    " $(ALL_LIB_C)
+       @echo "KMOD_INCLUDE_LIB=" $(KMOD_INCLUDE_LIB)
 
-# guard: fail early if no kmod sources (prevents confusing empty builds)
 ifndef BASE_LIST
 $(warning No *.kmod.c found under $(SOURCE_DIR); nothing to build)
 endif
@@ -40,24 +53,33 @@ kmod: _prepare modules
 
 .PHONY: _prepare
 _prepare:
-       @mkdir -p $(OUTPUT_DIR)
-       # purge any non-kmod staged *.c to avoid accidental pickup
-       @find "$(OUTPUT_DIR)" -maxdepth 1 -type f -name '*.c' ! -name '*.tmp' -delete 2>/dev/null || true
-       # declare exactly which modules to build
-       @printf "obj-m := %s\n" "$(foreach m,$(BASE_LIST),$(m).o)" > "$(OUTPUT_DIR)/Makefile"
-       # stage only kmod sources (symlink preferred; fallback to copy)
+       @mkdir -p "$(OUTPUT_DIR)"
+       # fresh Kbuild control file — one obj per module; each module also links lib objs (if any)
+       @{ \
+         printf "obj-m := %s\n" "$(foreach m,$(BASE_LIST),$(m).o)"; \
+         for m in $(BASE_LIST); do \
+           printf "%s-objs := %s.kmod.o" "$$m" "$$m"; \
+           for lb in $(LIB_BASE); do printf " %s.lib.o" "$$lb"; done; \
+           printf "\n"; \
+         done; \
+       } > "$(OUTPUT_DIR)/Makefile"
+       # stage kmod sources (read-only authored dir, write only to OUTPUT_DIR)
        @for b in $(BASE_LIST); do \
-         src="$(SOURCE_DIR)/$$b.kmod.c"; dst="$(OUTPUT_DIR)/$$b.c"; \
-         echo "--- Preparing Kbuild Source: $$dst ---"; \
-         ln -sf "$$src" "$$dst" 2>/dev/null || cp "$$src" "$$dst"; \
+         src="$(SOURCE_DIR)/$$b.kmod.c"; dst="$(OUTPUT_DIR)/$$b.kmod.c"; \
+         echo "--- Stage: $$dst ---"; ln -sf "$$src" "$$dst" 2>/dev/null || cp "$$src" "$$dst"; \
+       done
+       # stage library sources (optional)
+       @for b in $(LIB_BASE); do \
+         src="$(SOURCE_DIR)/$$b.lib.c"; dst="$(OUTPUT_DIR)/$$b.lib.c"; \
+         echo "--- Stage: $$dst ---"; ln -sf "$$src" "$$dst" 2>/dev/null || cp "$$src" "$$dst"; \
        done
 
 .PHONY: modules
-modules: $(OUTPUT_DIR)/Makefile $(ALL_C)
+modules: $(OUTPUT_DIR)/Makefile $(ALL_KMOD_C) $(ALL_LIB_C)
        @echo "--- Invoking Kbuild for Modules: $(BASE_LIST) ---"
        $(MAKE) -C "$(BUILD_DIR)" M="$(OUTPUT_DIR)" modules
 
-# Allow 'make scratchpad/kmod/.../foo.ko' after batch build
+# quality-of-life: allow 'make scratchpad/kmod/foo.ko' after batch build
 $(OUTPUT_DIR)/%.ko: modules
        @true
 
@@ -66,6 +88,8 @@ clean:
        @if [ -d "$(OUTPUT_DIR)" ]; then \
          echo "--- Cleaning Kbuild Artifacts in $(OUTPUT_DIR) ---"; \
          $(MAKE) -C "$(BUILD_DIR)" M="$(OUTPUT_DIR)" clean; \
-         find "$(OUTPUT_DIR)" -maxdepth 1 -type l -name '*.c' -delete 2>/dev/null || true; \
-         find "$(OUTPUT_DIR)" -maxdepth 1 -type f -name '*.c' -delete 2>/dev/null || true; \
+         find "$(OUTPUT_DIR)" -maxdepth 1 -type l -name '*.kmod.c' -delete 2>/dev/null || true; \
+         find "$(OUTPUT_DIR)" -maxdepth 1 -type l -name '*.lib.c'  -delete 2>/dev/null || true; \
+         find "$(OUTPUT_DIR)" -maxdepth 1 -type f -name '*.kmod.c' -delete 2>/dev/null || true; \
+         find "$(OUTPUT_DIR)" -maxdepth 1 -type f -name '*.lib.c'  -delete 2>/dev/null || true; \
        fi

diff --git a/developer/make/target_library_cli.mk b/developer/make/target_library_cli.mk
index 79d98de..3a0f4e3 100644 (file)
--- a/developer/make/target_library_cli.mk
+++ b/developer/make/target_library_cli.mk
@@ -1,7 +1,9 @@
-.SUFFIXES:
 # make/target_lib_cli.mk — build *.lib.c and *.cli.c
 # written for the Harmony skeleton, always invoked from cwd  $REPO_HOME/<role>
 
+.SUFFIXES:
+.EXPORT_ALL_VARIABLES:
+
 #--------------------------------------------------------------------------------
 # files have two suffixes by convention, e.g.: X.lib.c or Y.cli.c 
 #