From: Lady Date: Sun, 15 Sep 2024 19:57:34 +0000 (-0400) Subject: Update list, listout for two‐stage builds X-Git-Tag: 0.12.5^0 X-Git-Url: https://git.ladys.computer/Shushe/commitdiff_plain/2b85a319534edf60358ac73d57ad0d34b7a6d113 Update list, listout for two‐stage builds `make list` and `make listout` now list files from both stages. Note that in the case of `make listout`, these files may be in _either_ `/build/stage1/public/` or `/build/stage2/public/` (but hopefully not both). `list1`, `list2`, `listout1`, and `listout2` are added to list files just from a particular stage. --- diff --git a/GNUmakefile b/GNUmakefile index c654ddb..95fcbf4 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -820,8 +820,17 @@ install : all @$(MAKE) -f $(call quote,$(makefile)) $(foreach dest,$(patsubst $(BUILDDIR)/data/%,$(DESTDIR)/%,$(shell $(CAT) $(call quote,$(BUILDDIR)/data.out))),$(call quote,$(dest))) # List all source files and includes and their computed types. -list listout : data +list : data + @$(PRINTF) '%b' $(call quote,\0033[1;7m||Stage|1:||\0033[22;27m\0033[4m||||||||||||||||||||\0033[24m ) | $(TR) ' |' '\n ' + @$(MAKE) -f $(call quote,$(makefile)) $@ $(shushedataopts) + @$(PRINTF) '%b' $(call quote, \0033[1;7m||Stage|2:||\0033[22;27m\0033[4m||||||||||||||||||||\0033[24m ) | $(TR) ' |' '\n ' @$(MAKE) -f $(call quote,$(makefile)) $@ $(shushesiteopts) +listout : data + @{ $(MAKE) -f $(call quote,$(makefile)) $@ $(shushedataopts); $(MAKE) -f $(call quote,$(makefile)) $@ $(shushesiteopts); } | $(SED) '$$!s/$$/ /' | $(TR) -d '\n' +list1 listout1 : %1 : + @$(MAKE) -f $(call quote,$(makefile)) $* $(shushedataopts) +list2 listout2 : %2 : data + @$(MAKE) -f $(call quote,$(makefile)) $* $(shushesiteopts) # Destroy installed files. uninstall :