@profoundlogic/codermake 1.7.0 → 2.0.0

package/dist/makefiles/unix.mk

@@ -4,14 +4,25 @@
 ######
 
 ######
-# Bail out if required environment variables are not set properly.
+# Output library configuration. Two modes:
+#   - Single-library: IBMI_BUILD_LIBRARY required (today's behavior).
+#   - Multi-library:  CODERMAKE_LIBRARY_MAP drives per-target output libraries.
+#                     LIBRARY is intentionally undefined; recipes use TARGET_LIB
+#                     (= $(or $(TARGET_LIBRARY),$(LIBRARY))) which resolves via
+#                     the target-specific TARGET_LIBRARY emitted by the
+#                     preprocessor for each output rule.
 ######
-ifeq (,$(IBMI_BUILD_LIBRARY))
-  $(error Required variable IBMI_BUILD_LIBRARY is not set.)
-endif
-ifneq (1,$(words [$(IBMI_BUILD_LIBRARY)]))
-  $(error IBMI_BUILD_LIBRARY variable is not set correctly. Set to a valid library name and try again.)
+ifndef CODERMAKE_LIBRARY_MAP
+  ifeq (,$(IBMI_BUILD_LIBRARY))
+    $(error Required variable IBMI_BUILD_LIBRARY is not set.)
+  endif
+  ifneq (1,$(words [$(IBMI_BUILD_LIBRARY)]))
+    $(error IBMI_BUILD_LIBRARY variable is not set correctly. Set to a valid library name and try again.)
+  endif
+  LIBRARY := $(IBMI_BUILD_LIBRARY)
+  LIBRARY_PATH := /qsys.lib/$(LIBRARY).lib
 endif
+
 ifeq (,$(IBMI_HOST))
   $(warning Warning: Required variable IBMI_HOST is not set.)
 endif
@@ -20,10 +31,10 @@ ifeq (,$(IBMI_USER))
 endif
 
 ######
-# Output library.
+# Resolved per-recipe library and library path.
 ######
-LIBRARY := $(IBMI_BUILD_LIBRARY)
-LIBRARY_PATH := /qsys.lib/$(LIBRARY).lib
+TARGET_LIB = $(or $(TARGET_LIBRARY),$(LIBRARY))
+TARGET_LIB_PATH = /qsys.lib/$(TARGET_LIB).lib
 
 ######
 # Shell configuration.
@@ -58,14 +69,14 @@ SSH := $(SSH) $(IBMI_USER)@$(IBMI_HOST)
 ######
 define CREATE_SOURCE_MEMBER
 $(SSH) $(QSHELL) <<'EOF'
-  if [ ! -e '$(LIBRARY_PATH)/$(2).file' ]; then
-    system "crtsrcpf file($(LIBRARY)/$(2))"
+  if [ ! -e '$(TARGET_LIB_PATH)/$(2).file' ]; then
+    system "crtsrcpf file($(TARGET_LIB)/$(2))"
   fi
-  if [ ! -e '$(LIBRARY_PATH)/$(2).file/$(basename $(notdir $(1))).mbr' ]; then
-    system "addpfm file($(LIBRARY)/$(2)) mbr($(basename $(notdir $(1)))) srctype($(subst .,,$(suffix $(1))))"
+  if [ ! -e '$(TARGET_LIB_PATH)/$(2).file/$(basename $(notdir $(1))).mbr' ]; then
+    system "addpfm file($(TARGET_LIB)/$(2)) mbr($(basename $(notdir $(1)))) srctype($(subst .,,$(suffix $(1))))"
   fi
 EOF
-cat '$(1)' | $(SSH) "$(QSHELL) -c 'Rfile -Qw \"$(LIBRARY)/$(2)($(basename $(notdir $(1))))\"'"
+cat '$(1)' | $(SSH) "$(QSHELL) -c 'Rfile -Qw \"$(TARGET_LIB)/$(2)($(basename $(notdir $(1))))\"'"
 endef
 
 ######
@@ -75,40 +86,30 @@ endef
 ######
 define BUILD_FROM_CL_FILE
 $(call REMOTE_BUILD,$(2), \
-  rm -rf '$(LIBRARY_PATH)/$(notdir $(1))' && \
-  export LIBRARY=$(LIBRARY) && \
+  rm -rf '$(TARGET_LIB_PATH)/$(notdir $(1))' && \
+  export LIBRARY=$(TARGET_LIB) && \
   export NAME=$(basename $(notdir $(1))) && \
   ( \
     echo "$(file < $<)" | while IFS= read -r line; do \
       system "$$line"; \
     done \
-  ) || (rm -rf '$(LIBRARY_PATH)/$(notdir $(1))'; exit 1) \
+  ) || (rm -rf '$(TARGET_LIB_PATH)/$(notdir $(1))'; exit 1) \
 )
 endef
 
 ######
 # Utility to output "Creating X..." message and redirect recipe output to log file.
+# In multi-library mode, logs nest under the target's library to avoid collisions.
 ######
+LOG_DIR = tmp/logs$(if $(TARGET_LIBRARY),/$(TARGET_LIBRARY))
 define SETUP_LOG
 @echo "Creating $(1)"
-exec > 'tmp/logs/$(1).log' 2>&1
+$(MKDIR) -p '$(LOG_DIR)'
+exec > '$(LOG_DIR)/$(1).log' 2>&1
 endef
 
 ######
 # Reusable utility for remote builds via SSH.
-# Handles the complete pattern of:
-# 1. Creating an uncompressed tar archive of source files locally (preserving paths)
-# 2. Creating a temporary directory on IBM i and uploading the tar
-# 3. Extracting the tar (recreating directory structure), then executing build command with library list set
-# 4. Cleaning up temp directories (local and remote) and propagating exit codes
-#
-# $(1) = space-separated list of local files to upload
-# $(2) = build command to execute (typically a 'system' command)
-#
-# Files are archived with their full paths, so 'src/myfile.rpgle' will extract to
-# '$$REMOTE_DIR/src/myfile.rpgle' on the remote system.
-#
-# Build command runs with current directory set to the remote temp directory.
 ######
 ######
 # $(1) = source root directory to tar from (use '.' for current directory)
@@ -140,30 +141,47 @@ endef
 
 ######
 # Original REMOTE_BUILD is now a convenience wrapper (source root = '.')
-# $(1) = space-separated list of local files to upload
-# $(2) = build command to execute
 ######
 define REMOTE_BUILD
 $(call REMOTE_BUILD_FROM,.,$(1),$(2))
 endef
 
 ######
-# Prerun actions.
+# Prerun actions and banner.
 ######
 $(info ===)
 $(info Target IBM i: $(IBMI_HOST))
-$(info Target library: $(LIBRARY))
+ifdef CODERMAKE_LIBRARY_MAP
+  $(info Library map: $(CODERMAKE_RESOLVED_LIBRARY_MAP))
+  ifdef CODERMAKE_LIBRARY_LIST
+    $(info Library list: $(CODERMAKE_LIBRARY_LIST))
+  else
+    $(info Library list: (inherited from job/profile))
+  endif
+else
+  $(info Target library: $(LIBRARY))
+endif
 $(info Build user: $(IBMI_USER))
 $(info ===)
 $(shell mkdir -p build)
 
 ######
-# Library creation target
+# Library creation. Single-library mode keeps today's specific-target file
+# marker (`build/<LIBRARY>.lib` is a regular touched file). Multi-library mode
+# uses a pattern rule where the directory itself (`build/<lib>.lib/`) is the
+# library-existence marker — created by the recipe alongside the remote crtlib.
 ######
+ifndef CODERMAKE_LIBRARY_MAP
 build/$(LIBRARY).lib:
 	$(call SETUP_LOG,$(notdir $@))
 	$(SSH) "test -e $(LIBRARY_PATH) || system \"crtlib $(LIBRARY) *test aut(*use) crtaut(*use)\""
 	touch '$@'
+else
+build/%.lib:
+	$(call SETUP_LOG,$(notdir $@))
+	$(SSH) "test -e /qsys.lib/$*.lib || system \"crtlib $* *test aut(*use) crtaut(*use)\""
+	mkdir -p '$@'
+endif
 
 ######
 # Recipe utilities (callable functions for preprocessor-generated rules)
@@ -173,7 +191,7 @@ build/$(LIBRARY).lib:
 define BUILD_RPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtbndrpg pgm($(LIBRARY)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtbndrpg pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -182,7 +200,7 @@ endef
 define BUILD_SQLRPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(LIBRARY)/$(basename $(@F))) objtype(*pgm) srcstmf('$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*pgm) srcstmf('$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -191,7 +209,7 @@ endef
 define BUILD_RPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtrpgmod module($(LIBRARY)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtrpgmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -200,7 +218,7 @@ endef
 define BUILD_SQLRPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(LIBRARY)/$(basename $(@F))) objtype(*module) srcstmf('$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*module) srcstmf('$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -208,21 +226,21 @@ endef
 # Build ILE COBOL program (bound)
 define BUILD_CBLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtbndcbl pgm($(LIBRARY)/$(basename $(@F))) srcstmf('$<') output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtbndcbl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)")
 touch '$@'
 endef
 
 # Build ILE COBOL module
 define BUILD_CBLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtcblmod module($(LIBRARY)/$(basename $(@F))) srcstmf('$<') output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtcblmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)")
 touch '$@'
 endef
 
 # Build ILE CL program (bound)
 define BUILD_CLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtbndcl pgm($(LIBRARY)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtbndcl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
 touch '$@'
 endef
 
@@ -232,7 +250,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qclsrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtclpgm pgm($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qclsrc) output(*print)"
+  system "crtclpgm pgm($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qclsrc) output(*print)"
 EOF
 touch '$@'
 endef
@@ -240,7 +258,7 @@ endef
 # Build ILE CL module
 define BUILD_CLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtclmod module($(LIBRARY)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtclmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
 touch '$@'
 endef
 
@@ -249,7 +267,7 @@ define BUILD_MODULE_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtpgm pgm($(LIBRARY)/$(basename $(@F))) module($(foreach m,$(filter %.module,$^),$(basename $(notdir $(m))))) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+  system "crtpgm pgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 EOF
 touch '$@'
 endef
@@ -257,7 +275,7 @@ endef
 # Build service program from modules
 define BUILD_MODULE_TO_SRVPGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtsrvpgm srvpgm($(LIBRARY)/$(basename $(@F))) module($(foreach m,$(filter %.module,$^),$(basename $(notdir $(m))))) export(*srcfile) srcstmf('$(filter %.exports %.bnd,$^)') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtsrvpgm srvpgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) export(*srcfile) srcstmf('$(filter %.exports %.bnd,$^)') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)")
 touch '$@'
 endef
 
@@ -266,7 +284,7 @@ define BUILD_MODULE_TO_SRVPGM_ALL
 $(call SETUP_LOG,$(notdir $@))
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtsrvpgm srvpgm($(LIBRARY)/$(basename $(@F))) module($(foreach m,$(filter %.module,$^),$(basename $(notdir $(m))))) export(*all) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+  system "crtsrvpgm srvpgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) export(*all) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 EOF
 touch '$@'
 endef
@@ -277,7 +295,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtdspf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc)"
+  system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
 EOF
 touch '$@'
 endef
@@ -289,7 +307,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,tmp/$(basename $(@F)).dspf,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtdspf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc) enhdsp(*yes)"
+  system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) enhdsp(*yes)"
 EOF
 rm -f 'tmp/$(basename $(@F)).dspf'
 touch '$@'
@@ -301,7 +319,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtpf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc)"
+  system "crtpf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
 EOF
 touch '$@'
 endef
@@ -312,7 +330,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtlf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc)"
+  system "crtlf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
 EOF
 touch '$@'
 endef
@@ -323,7 +341,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtprtf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc)"
+  system "crtprtf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
 EOF
 touch '$@'
 endef
@@ -331,28 +349,28 @@ endef
 # Build SQL table
 define BUILD_SQLTABLE_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
 # Build SQL index
 define BUILD_SQLINDEX_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
 # Build SQL view
 define BUILD_SQLVIEW_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
 # Build SQL procedure
 define BUILD_SQLPROC_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
@@ -375,13 +393,16 @@ define BUILD_MENU
 $(call SETUP_LOG,$(notdir $@))
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtmnu menu($(LIBRARY)/$(basename $(@F))) type(*dspf) dspf($(basename $(notdir $(filter %.file,$^)))) msgf($(basename $(notdir $(filter %.msgf,$^)))) cmdlin(*none) dspkey(*no)"
+  system "crtmnu menu($(TARGET_LIB)/$(basename $(@F))) type(*dspf) dspf($(basename $(notdir $(filter %.file,$^)))) msgf($(basename $(notdir $(filter %.msgf,$^)))) cmdlin(*none) dspkey(*no)"
 EOF
 touch '$@'
 endef
 
 ######
-# Platform-specific clean
+# Platform-specific clean. Each target's path encodes its library, so the
+# library segment is extracted per-target. Works for both modes — in
+# single-library mode every target path is `build/<obj>.<ext>` (no library
+# segment), so we fall back to $(LIBRARY) for the IBM i delete.
 ######
 .PHONY: platform-clean
 platform-clean:
@@ -389,19 +410,39 @@ platform-clean:
 	rm -rf tmp/logs
 	rm -rf tmp/codermake_*.tar
 	rm -rf tmp/rpg-pp-*
-	@CLEAN_TARGETS="$(notdir $(TARGETS))"
-	if [ -n "$$CLEAN_TARGETS" ]; then
+	@if [ -n "$(TARGETS)" ]; then
 	  $(SSH) $(QSHELL) <<EOF
-	    if [ -d $(LIBRARY_PATH) ]; then
-	      for pass in 1 2; do
-	        for target in $$CLEAN_TARGETS; do
-	          if [ "\$${target%.file}" != "\$$target" ]; then
-	            system "dltf $(LIBRARY)/\$${target%.file}" > /dev/null 2>&1 || true
+	    # Two passes over all targets so dependent objects (e.g. SQL views/indexes
+	    # over a table) get deleted in the first pass, freeing the underlying object
+	    # for deletion in the second pass.
+	    for pass in 1 2; do
+	      for target in $(TARGETS); do
+	        # Strip "build/" prefix to get the relative portion.
+	        rel="\$${target#build/}"
+	        if [ "\$$rel" = "\$$target" ]; then
+	          continue
+	        fi
+	        # If "rel" contains a "/", it's "<lib>.lib/<obj>" (multi-library).
+	        # Otherwise it's just "<obj>" (single-library, fall back to \$$LIBRARY).
+	        case "\$$rel" in
+	          */*)
+	            lib_part="\$${rel%%/*}"
+	            lib="\$${lib_part%.lib}"
+	            obj="\$${rel#*/}"
+	            ;;
+	          *)
+	            lib="$(LIBRARY)"
+	            obj="\$$rel"
+	            ;;
+	        esac
+	        if [ -d "/qsys.lib/\$$lib.lib" ]; then
+	          if [ "\$${obj%.file}" != "\$$obj" ]; then
+	            system "dltf \$$lib/\$${obj%.file}" > /dev/null 2>&1 || true
 	          else
-	            rm -rf "$(LIBRARY_PATH)/\$$target"
+	            rm -rf "/qsys.lib/\$$lib.lib/\$$obj" 2>/dev/null || true
 	          fi
-	        done
+	        fi
 	      done
-	    fi
+	    done
 	EOF
 	fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profoundlogic/codermake",
-  "version": "1.7.0",
+  "version": "2.0.0",
   "description": "Make wrapper framework for IBM i development that simplifies build rules",
   "main": "dist/bin/index.js",
   "type": "module",
@@ -21,7 +21,8 @@
     "test:dist:integration": "CODERMAKE_E2E_TEST=true node --test --test-concurrency=1 dist/test/integration/**/*.test.js",
     "lint": "eslint . --ignore-pattern dist/",
     "start": "./bin/index.js",
-    "prepublishOnly": "npm run lint && npm test && npm run build && npm run test:dist"
+    "check:multi-library-env": "node -e \"import('dotenv/config').then(() => { if (!process.env.CODERMAKE_E2E_LIBRARY_MAP || !process.env.CODERMAKE_E2E_LIBRARY_MAP.trim()) { console.error('CODERMAKE_E2E_LIBRARY_MAP must be set for prepublish (e.g. \\\"LIBA=DEVLIBA LIBB=DEVLIBB\\\"). Gates the multi-library output integration tests.'); process.exit(1); } })\"",
+    "prepublishOnly": "npm run check:multi-library-env && npm run lint && npm test && npm run build && npm run test:dist"
   },
   "author": "Profound Logic Software",
   "license": "SEE LICENSE IN LICENSE.txt",

package/skills/codermake/SKILL.md

@@ -76,6 +76,20 @@ Files with a path separator are treated as relative to the project root (not the
 mysrvpgm.srvpgm: mymod.module common/api.exports
 ```
 
+In a multi-library project (sources organized under library-equivalent directories like `LIBA/qrpglesrc/`), two-segment paths whose first segment is a known library directory and whose second segment is a bare object filename with an output extension are recognized as **cross-library object qualifiers**:
+
+```makefile
+# In LIBA/qrpglesrc/Rules.mk -- depend on a srvpgm in LIBB
+crossbnd.pgm: crossbnd.rpgle | LIBB/utils.srvpgm
+
+# Library-qualified target: source in LIBA's tree, output lands in LIBB
+LIBB/installer.pgm: installer.rpgle
+```
+
+Two-segment paths whose second segment has a *source* extension, or three-or-more-segment paths, are cross-library *source* passthroughs (e.g. `LIBB/qcpysrc/shared.rpgle`).
+
+A library qualifier whose first segment is not a known library directory is an error — codermake will tell you which token failed validation.
+
 ### Message files and binding directories (dual-purpose pattern)
 
 The `.msgf` and `.bnddir` extensions serve double duty -- as source when they are the first prerequisite of a matching target type, and as built objects everywhere else:
@@ -186,7 +200,7 @@ existing.srvpgm: existing_mod.module newmod.module existing.exports
 
 ## Troubleshooting
 
-Build logs are in `tmp/logs/<target>.log`. When a build fails:
+Build logs are in `tmp/logs/<target>.log`. In multi-library output mode (when `CODERMAKE_LIBRARY_MAP` is set) logs are nested under the IBM i library: `tmp/logs/<libraryName>/<target>.log`. When a build fails:
 
 1. Open the log file for the failing target.
 2. Search for error message IDs (e.g., `RNF`, `SQL`, `CPF`, `CPD`).
@@ -194,6 +208,12 @@ Build logs are in `tmp/logs/<target>.log`. When a build fails:
 4. For DDS/CL, look for `CPF` or `CPD` message IDs in the output.
 5. Use `codermake --print-rules` to verify the generated Makefile if the target is not being built at all.
 
+Common errors:
+
+- **`Invalid library qualifier '<lib>/<obj>.<ext>': '<lib>' is not a known library directory.`** — the first segment of a two-segment qualifier doesn't match any discovered library directory. Either fix the typo or add the missing directory to the project layout.
+- **`<envvar> and CODERMAKE_LIBRARY_MAP are mutually exclusive.`** — only one output-mode variable can be set. Pick `BUILD_LIBRARY`/`IBMI_BUILD_LIBRARY` (single library) **or** `CODERMAKE_LIBRARY_MAP` (per-library output).
+- **`CODERMAKE_LIBRARY_MAP is missing entries for: <dir1>, <dir2>`** — every discovered library directory must appear in an explicit map. Add the missing entries, or switch to `CODERMAKE_LIBRARY_MAP=auto` for natural mapping.
+
 For detailed guidance on reading compile listings, see [references/compile-listings.md](references/compile-listings.md).
 
 ## Environment variables
@@ -204,7 +224,7 @@ codermake reads its configuration from environment variables (typically set in a
 
 | Variable | Description |
 |---|---|
-| `IBMI_BUILD_LIBRARY` | Target IBM i library for compiled objects |
+| `IBMI_BUILD_LIBRARY` | Target IBM i library for compiled objects (single-library output mode) |
 | `IBMI_HOST` | IBM i hostname or IP address |
 | `IBMI_USER` | SSH username on the IBM i |
 | `IBMI_KEY` | Path to SSH private key (optional) |
@@ -213,4 +233,15 @@ codermake reads its configuration from environment variables (typically set in a
 
 | Variable | Description |
 |---|---|
-| `BUILD_LIBRARY` | Target IBM i library for compiled objects |
+| `BUILD_LIBRARY` | Target IBM i library for compiled objects (single-library output mode) |
+
+### Multi-library output (alternative to BUILD_LIBRARY / IBMI_BUILD_LIBRARY)
+
+When the project has a multi-library layout, `CODERMAKE_LIBRARY_MAP` enables per-library output — each library-equivalent source directory builds into a distinct IBM i library. Mutually exclusive with `BUILD_LIBRARY` / `IBMI_BUILD_LIBRARY`.
+
+| Variable | Description |
+|---|---|
+| `CODERMAKE_LIBRARY_MAP` | Either `auto` (natural mapping: dir name → library name) or explicit `LIBA=APPLIBA LIBB=APPLIBB` pairs. Mutually exclusive with `BUILD_LIBRARY` / `IBMI_BUILD_LIBRARY`. |
+| `CODERMAKE_LIBRARY_LIST` | Optional. Space-separated, ordered IBM i library list. Replaces the user portion of the build job's library list. Only valid alongside `CODERMAKE_LIBRARY_MAP`. |
+
+When using multi-library output, refer to objects in another library with the qualifier syntax `<libraryDir>/<bareobj>.<ext>` (see *Cross-directory references* above).