@profoundlogic/codermake 1.7.0 → 2.0.1

package/dist/makefiles/Makefile

@@ -24,6 +24,40 @@ $(shell rm -rf tmp/logs && $(MKDIR) -p tmp/logs)
 -include $(CODERMAKE_RULES_DIR)/rules.mk
 -include $(CODERMAKE_RULES_DIR)/targets.mk
 
+# Detect short-flag invocations like `make -n` or `make -t`. MAKEFLAGS lists
+# short flags as the FIRST word with no leading `-` (e.g. "tn"); long options
+# follow with their full `--name` form. We only want to match the short chunk
+# here — looking at MAKEFLAGS as a whole gives false positives because
+# `--output-sync=target` and `--no-builtin-rules` (added by base.mk) contain
+# 't' and 'n' as substrings.
+MAKE_SHORTFLAGS := $(filter-out -%,$(firstword $(MAKEFLAGS)))
+
+# Per-library bin dirs computed from TARGETS (Unix-like only).
+# Under `make -t` / `make -n` recipes don't run, so we pre-create these dirs at
+# parse time so dummies inside `build/<lib>.lib/` can be touched. In normal
+# builds, the directory rule in unix.mk creates each one on demand.
+ifneq ($(OS),OS400)
+LIBRARY_BIN_DIRS := $(patsubst %/,%,$(sort $(dir $(filter build/%,$(TARGETS)))))
+ifneq (,$(strip $(LIBRARY_BIN_DIRS)))
+ifneq (,$(findstring t,$(MAKE_SHORTFLAGS))$(findstring n,$(MAKE_SHORTFLAGS)))
+$(shell mkdir -p $(LIBRARY_BIN_DIRS))
+endif
+endif
+endif
+
+# In multi-library output mode, SET_LIBL adds every library in
+# CODERMAKE_LIBRARY_LIST to the IBM i library list. Each target's own library
+# is already an order-only prereq, but if any target's recipe references
+# libraries outside its own (via SET_LIBL), those must also exist first.
+# Ensure all libraries used by any target in TARGETS exist before any recipe
+# runs by adding them as order-only prereqs to every target.
+ifdef CODERMAKE_LIBRARY_MAP
+ALL_TARGET_LIB_PATHS := $(patsubst %/,%,$(sort $(dir $(TARGETS))))
+ifneq (,$(strip $(ALL_TARGET_LIB_PATHS)))
+$(TARGETS): | $(ALL_TARGET_LIB_PATHS)
+endif
+endif
+
 # Default target
 .DEFAULT_GOAL := all
 .PHONY: all

package/dist/makefiles/base.mk

@@ -13,15 +13,55 @@ MAKEFLAGS += --no-builtin-rules
 MAKEFLAGS += --output-sync=target
 
 ######
-# Utility to set library list.
-######
-define SET_LIBL
-liblist -cd
-if liblist | grep -Eiq '^$(LIBRARY)[[:space:]]+'; then
-  liblist -d $(LIBRARY)
-fi
-liblist -af $(LIBRARY)
-endef
+# Helper: extract the IBM i library name from an output target path.
+#
+# `/qsys.lib/APPLIBA.lib/foo.pgm`  -> `APPLIBA`
+# `build/APPLIBA.lib/foo.pgm`      -> `APPLIBA`
+######
+output_lib_of = $(patsubst %.lib,%,$(notdir $(patsubst %/,%,$(dir $(1)))))
+
+######
+# Utility to set the IBM i library list. Three modes selected at parse time:
+#
+#   1. Single-library mode (BUILD_LIBRARY / IBMI_BUILD_LIBRARY set):
+#      Today's behavior. Reset to default, remove $(LIBRARY) if already on the
+#      list, then add it to the front of the user portion.
+#
+#   2. Multi-library mode without CODERMAKE_LIBRARY_LIST:
+#      No-op. The library list is whatever the job/profile inherits.
+#
+#   3. Multi-library mode with CODERMAKE_LIBRARY_LIST:
+#      Entirely replace the user portion of the library list with the libraries
+#      named in CODERMAKE_LIBRARY_LIST, in order.
+#
+# `liblist` is a PASE shell built-in that mutates the CURRENT shell's library
+# list — subsequent `system "..."` calls inherit it. CHGLIBL would not work
+# because it only affects the spawned job, not the parent shell.
+######
+ifdef CODERMAKE_LIBRARY_MAP
+  ifdef CODERMAKE_LIBRARY_LIST
+    define SET_LIBL
+    liblist -cd
+    LIBS=$$(liblist | grep ' USR[[:space:]]*$$' | cut -c 1-10)
+    if [ -n "$$LIBS" ]; then
+      liblist -d $$LIBS
+    fi
+    liblist -al $(CODERMAKE_LIBRARY_LIST)
+    endef
+  else
+    define SET_LIBL
+    :
+    endef
+  endif
+else
+  define SET_LIBL
+  liblist -cd
+  if liblist | grep -Eiq '^$(LIBRARY)[[:space:]]+'; then
+    liblist -d $(LIBRARY)
+  fi
+  liblist -af $(LIBRARY)
+  endef
+endif
 
 ######
 # RPG /COPY preprocessor - converts source member style directives to IFS paths
@@ -44,6 +84,27 @@ endef
 # Binding parameter generation from prerequisites.
 # Expands to CL parameters when matching prerequisites exist, empty otherwise.
 # Used by BUILD_MODULE_TO_PGM (CRTPGM) and BUILD_MODULE_TO_SRVPGM (CRTSRVPGM).
+#
+# BNDSRVPGM and BNDDIR stay UNQUALIFIED in both modes by design — runtime
+# library-list resolution is the lever developers use to substitute private
+# library copies of service programs and binding directories without rebuilding
+# consumer programs. CODERMAKE_LIBRARY_LIST is the appropriate way to control
+# resolution when conflicts exist across mapped libraries.
 ######
 BNDSRVPGM_PARM = $(if $(filter %.srvpgm,$^ $|),bndsrvpgm($(foreach s,$(filter %.srvpgm,$^ $|),$(basename $(notdir $(s))))),)
 BNDDIR_PARM = $(if $(filter %.bnddir,$^ $|),bnddir($(foreach d,$(filter %.bnddir,$^ $|),$(basename $(notdir $(d))))),)
+
+######
+# MODULE() parameter for CRTPGM / CRTSRVPGM.
+#
+# Modules are EMBEDDED into the resulting program/srvpgm at link time — there
+# is no runtime resolution of module references. So in multi-library mode we
+# qualify each module's library explicitly (`module((LIB/name) (LIB/name))`),
+# guaranteeing the correct module is bound regardless of library-list order.
+# In single-library mode we keep today's unqualified form.
+######
+ifdef CODERMAKE_LIBRARY_MAP
+  MODULE_PARM = module($(foreach m,$(filter %.module,$^),($(call output_lib_of,$m)/$(basename $(notdir $m)))))
+else
+  MODULE_PARM = module($(foreach m,$(filter %.module,$^),$(basename $(notdir $m))))
+endif

package/dist/makefiles/ibmi.mk

@@ -4,20 +4,30 @@
 ######
 
 ######
-# Bail out if required environment variables are not set properly.
+# Output library configuration. Two modes:
+#   - Single-library: 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 (,$(BUILD_LIBRARY))
-  $(error Required variable BUILD_LIBRARY is not set.)
-endif
-ifneq (1,$(words [$(BUILD_LIBRARY)]))
-  $(error BUILD_LIBRARY variable is not set correctly. Set to a valid library name and try again)
+ifndef CODERMAKE_LIBRARY_MAP
+  ifeq (,$(BUILD_LIBRARY))
+    $(error Required variable BUILD_LIBRARY is not set.)
+  endif
+  ifneq (1,$(words [$(BUILD_LIBRARY)]))
+    $(error BUILD_LIBRARY variable is not set correctly. Set to a valid library name and try again)
+  endif
+  LIBRARY := $(BUILD_LIBRARY)
+  LIBRARY_PATH := /qsys.lib/$(LIBRARY).lib
 endif
 
 ######
-# Output library.
+# Resolved per-recipe library and library path.
 ######
-LIBRARY := $(BUILD_LIBRARY)
-LIBRARY_PATH := /qsys.lib/$(LIBRARY).lib
+TARGET_LIB = $(or $(TARGET_LIBRARY),$(LIBRARY))
+TARGET_LIB_PATH = /qsys.lib/$(TARGET_LIB).lib
 
 ######
 # Shell configuration.
@@ -32,9 +42,9 @@ MKDIR := /QOpenSys/usr/bin/mkdir
 # $(2) = source file name (e.g., qddssrc, qrpglesrc)
 ######
 define CREATE_SOURCE_MEMBER
-test -e $(LIBRARY_PATH)/$(2).file || system "crtsrcpf file($(LIBRARY)/$(2))"
-test -e $(LIBRARY_PATH)/$(2).file/$(basename $(notdir $(1))).mbr || system "addpfm file($(LIBRARY)/$(2)) mbr($(basename $(notdir $(1)))) srctype($(subst .,,$(suffix $(1))))"
-cat '$(1)' | Rfile -Qw '$(LIBRARY)/$(2)($(basename $(notdir $(1))))'
+test -e $(TARGET_LIB_PATH)/$(2).file || system "crtsrcpf file($(TARGET_LIB)/$(2))"
+test -e $(TARGET_LIB_PATH)/$(2).file/$(basename $(notdir $(1))).mbr || system "addpfm file($(TARGET_LIB)/$(2)) mbr($(basename $(notdir $(1)))) srctype($(subst .,,$(suffix $(1))))"
+cat '$(1)' | Rfile -Qw '$(TARGET_LIB)/$(2)($(basename $(notdir $(1))))'
 endef
 
 ######
@@ -44,7 +54,7 @@ endef
 ######
 define BUILD_FROM_CL_FILE
 rm -rf '$(1)'
-export LIBRARY=$(LIBRARY)
+export LIBRARY=$(TARGET_LIB)
 export NAME=$(basename $(notdir $(1)))
 (
   $(SET_LIBL)
@@ -56,26 +66,47 @@ 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
+# when two libraries contain objects with the same short name.
 ######
+LOG_DIR = tmp/logs$(if $(TARGET_LIBRARY),/$(TARGET_LIBRARY))
 define SETUP_LOG
 @echo "Creating $(1)"
-/usr/bin/touch -C 1208 'tmp/logs/$(1).log'
-exec > 'tmp/logs/$(1).log' 2>&1
+$(MKDIR) -p '$(LOG_DIR)'
+/usr/bin/touch -C 1208 '$(LOG_DIR)/$(1).log'
+exec > '$(LOG_DIR)/$(1).log' 2>&1
 endef
 
 ######
-# Prerun actions.
+# Prerun actions and banner.
 ######
 $(info ===)
-$(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 ===)
 
 ######
-# Library creation target
+# Library creation. Single-library mode keeps today's specific-target rule;
+# multi-library mode uses a pattern rule so each mapped library gets created
+# on demand the first time an object targets it.
 ######
+ifndef CODERMAKE_LIBRARY_MAP
 $(LIBRARY_PATH):
 	$(call SETUP_LOG,$(notdir $@))
 	system "crtlib $(LIBRARY) *test aut(*use) crtaut(*use)"
+else
+/qsys.lib/%.lib:
+	$(call SETUP_LOG,$(notdir $@))
+	system "crtlib $* *test aut(*use) crtaut(*use)"
+endif
 
 ######
 # Recipe utilities (callable functions for preprocessor-generated rules)
@@ -84,36 +115,36 @@ $(LIBRARY_PATH):
 # Build RPGLE program (bound)
 define BUILD_RPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(LIBRARY_PATH)/%,$^))
+$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtbndrpg pgm($(LIBRARY)/$(basename $(@F))) srcstmf('$$RPG_SRC_ROOT/$<') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtbndrpg pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$$RPG_SRC_ROOT/$<') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
 # Build SQL RPGLE program
 define BUILD_SQLRPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(LIBRARY_PATH)/%,$^))
+$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtsqlrpgi obj($(LIBRARY)/$(basename $(@F))) objtype(*pgm) srcstmf('$$RPG_SRC_ROOT/$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
+system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*pgm) srcstmf('$$RPG_SRC_ROOT/$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
 # Build RPGLE module
 define BUILD_RPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
-$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(LIBRARY_PATH)/%,$^))
+$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtrpgmod module($(LIBRARY)/$(basename $(@F))) srcstmf('$$RPG_SRC_ROOT/$<') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtrpgmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$$RPG_SRC_ROOT/$<') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
 # Build SQL RPGLE module
 define BUILD_SQLRPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
-$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(LIBRARY_PATH)/%,$^))
+$(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtsqlrpgi obj($(LIBRARY)/$(basename $(@F))) objtype(*module) srcstmf('$$RPG_SRC_ROOT/$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
+system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*module) srcstmf('$$RPG_SRC_ROOT/$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
@@ -121,21 +152,21 @@ endef
 define BUILD_CBLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtbndcbl pgm($(LIBRARY)/$(basename $(@F))) srcstmf('$<') output(*print) dbgview(*all)"
+system "crtbndcbl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)"
 endef
 
 # Build ILE COBOL module
 define BUILD_CBLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtcblmod module($(LIBRARY)/$(basename $(@F))) srcstmf('$<') output(*print) dbgview(*all)"
+system "crtcblmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)"
 endef
 
 # Build ILE CL program (bound)
 define BUILD_CLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtbndcl pgm($(LIBRARY)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtbndcl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)"
 endef
 
 # Build OPM CL program
@@ -143,35 +174,35 @@ define BUILD_CLP_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qclsrc)
 $(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)"
 endef
 
 # Build ILE CL module
 define BUILD_CLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtclmod module($(LIBRARY)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtclmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)"
 endef
 
 # Build program from modules
 define BUILD_MODULE_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(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)"
 endef
 
 # Build service program from modules
 define BUILD_MODULE_TO_SRVPGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtsrvpgm srvpgm($(LIBRARY)/$(basename $(@F))) module($(foreach m,$(filter %.module,$^),$(basename $(notdir $(m))))) export(*srcfile) srcstmf('$(filter %.exports %.bnd,$^)') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+system "crtsrvpgm srvpgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) export(*srcfile) srcstmf('$(filter %.exports %.bnd,$^)') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 endef
 
 # Build service program from modules (export all procedures)
 define BUILD_MODULE_TO_SRVPGM_ALL
 $(call SETUP_LOG,$(notdir $@))
 $(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)"
 endef
 
 # Build display file
@@ -179,7 +210,7 @@ define BUILD_DSPF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtdspf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc)"
+system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
 endef
 
 # Build display file from RDF (Rich Display File) JSON
@@ -188,7 +219,7 @@ $(call SETUP_LOG,$(notdir $@))
 '$(CODERMAKE_NODE)' '$(CODERMAKE_PACKAGE_DIR)/bin/rdf-to-dds.js' '$<' 'tmp/$(basename $(@F)).dspf'
 $(call CREATE_SOURCE_MEMBER,tmp/$(basename $(@F)).dspf,qddssrc)
 $(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)"
 rm -f 'tmp/$(basename $(@F)).dspf'
 endef
 
@@ -197,7 +228,7 @@ define BUILD_PF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtpf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc) aut(*change)"
+system "crtpf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) aut(*change)"
 endef
 
 # Build logical file
@@ -205,7 +236,7 @@ define BUILD_LF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtlf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc)"
+system "crtlf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
 endef
 
 # Build printer file
@@ -213,35 +244,35 @@ define BUILD_PRTF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtprtf file($(LIBRARY)/$(basename $(@F))) srcfile($(LIBRARY)/qddssrc)"
+system "crtprtf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
 endef
 
 # Build SQL table
 define BUILD_SQLTABLE_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))"
+system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build SQL index
 define BUILD_SQLINDEX_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))"
+system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build SQL view
 define BUILD_SQLVIEW_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))"
+system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build SQL procedure
 define BUILD_SQLPROC_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(LIBRARY))"
+system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build message file from CL commands
@@ -260,22 +291,30 @@ endef
 define BUILD_MENU
 $(call SETUP_LOG,$(notdir $@))
 $(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)"
 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's library is $(LIBRARY).
 ######
 .PHONY: platform-clean
 platform-clean:
 	@rm -rf tmp/rpg-pp-*
-	if [ -n "$(TARGETS)" ] && [ -d $(LIBRARY_PATH) ]; then
+	if [ -n "$(TARGETS)" ]; then
 	  for pass in 1 2; do
 	    for target in $(TARGETS); do
-	      if [ "$${target%.file}" != "$$target" ]; then
-	        (system "dltf $(LIBRARY)/$$(basename $$target .file)" > /dev/null 2>&1) || true
-	      else
-	        rm -rf "$$target"
+	      lib_part=$${target#/qsys.lib/}
+	      lib=$${lib_part%%/*}
+	      lib=$${lib%.lib}
+	      obj=$$(basename "$$target")
+	      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 "/qsys.lib/$$lib.lib/$$obj" 2>/dev/null || true
+	        fi
 	      fi
 	    done
 	  done