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 c654ddbfcc160d9423a1858440c7bcb6cbb72b6c..95fcbf4e40304c0d75d1197b5fb0c1b59118208f 100644 (file)
--- 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 :