Minor, largely‐inconsequential refactors

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 53db7f25eeb1ca9555dcd9852f5c9553c57b8c4d..70183f8bfe092712f0428c90dee2811b8b752af5 100644 (file)
--- 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))))
 
 # (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.
 
 # (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' '<?xml version=\042
 
 # Provide help.
 help:
 
 # Provide help.
 help:

-       $(silent)$(PRINTF) '%b' '$(subst $(newline),\n,$(makefileinfo))'
+       @$(PRINTF) '%b' '$(subst $(newline),\n,$(makefileinfo))'

 
 # Compile all files, or error if any are recursive.
 
 # Compile all files, or error if any are recursive.

-all: $(call compiled,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles))) ;
+all: $(call compiled,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles)));

 
 # Destroy buildfiles.
 clean:
 
 # Destroy buildfiles.
 clean:


@@ -387,11 +387,11 @@ gone:
        $(silent)$(RM) -rf $(BUILDDIR)/ $(call compiled,$(recursivefiles) $(compilablefiles))
 
 # Install the compiled files into `DESTDIR´.
        $(silent)$(RM) -rf $(BUILDDIR)/ $(call compiled,$(recursivefiles) $(compilablefiles))
 
 # Install the compiled files into `DESTDIR´.

-install: $(call installed,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles))) ;
+install: $(call installed,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles)));

 
 # List all source files and includes and their computed types.
 list:
 
 # List all source files and includes and their computed types.
 list:

-       $(silent)$(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 '
+       @$(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.
 
 # Raise an error when attempting to build any files with recursive
 # dependencies.