From: Lady Date: Fri, 19 Jan 2024 04:27:08 +0000 (-0500) Subject: Minor, largely‐inconsequential refactors X-Git-Tag: 0.4.1~3 X-Git-Url: https://git.ladys.computer/Shushe/commitdiff_plain/54dfa39ba4c73ae0d9a0fa608d9d48f40d63e136 Minor, largely‐inconsequential refactors - Make some prints always be silent (use `@` not `$(silent)`). - Don’t give includes mappings in `sourcecompiledpair` (they will always be empty, because includes aren’t compiled). - Remove white·space between prereqs and trailing semi. --- diff --git a/GNUmakefile b/GNUmakefile index 53db7f2..70183f8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -345,8 +345,8 @@ override sourcedestinationpair := $(foreach destination,$(destinations),$(call s # (callable) Get the destination for the given source files. override destination = $(foreach file,$1,$(patsubst $(file)|%,%,$(filter $(file)|%,$(sourcedestinationpair)))) -# Pair each source file and include with its compiled location. -override sourcecompiledpair := $(foreach file,$(sourcefiles) $(sourceincludes),$(file)|$(BUILDDIR)/public/$(call destination,$(file))) +# Pair each source file with its compiled location. +override sourcecompiledpair := $(foreach file,$(sourcefiles),$(file)|$(BUILDDIR)/public/$(call destination,$(file))) # (callable) Get the location of the transformed X·M·L files for the # given source files. @@ -373,10 +373,10 @@ override wrapplaintext = $(PRINTF) '%s\n' "$$($(PRINTF) '%b' ',) )) | $(TR) ' |' '\n ' + @$(PRINTF) '%b' $(call quote,$(foreach file,$(sort $(sourcefiles)) $(sort $(sourceincludes)),\0033[1m$(file)\0033[22m|$(call typeoffile,$(file))|[\0033[3m$(if $(filter $(file),$(xmlfiles)),xml,$(if $(filter $(file),$(plaintextfiles)),text,asset))$(if $(filter $(file),$(sourceincludes)),|include,)\0033[23m]$(if $(call dependencies,$(file))$(call recursives,$(file)), $(strip $(foreach recursive,$(call recursives,$(file)),\0033[93;41m•|Recursive|Dependency|\0033[39;49m|$(recursive)) $(foreach dependency,$(call dependencies,$(file)),\0033[2m•|Dependency|\0033[22m|$(dependency))))$(if $(filter $(file),$(sourcefiles)), →|<\0033[4m/$(call destination,$(file))\0033[24m>,) )) | $(TR) ' |' '\n ' # Raise an error when attempting to build any files with recursive # dependencies.