From 76d68dde7ce58962e14a5742a0321721ea2b89df Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 9 May 2023 16:44:57 -0500 Subject: [PATCH] Better variable names and comments --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 98bd27b..917bdd7 100644 --- a/Makefile +++ b/Makefile @@ -113,10 +113,11 @@ M4_FILES := $(filter-out %epilog.inc.m4, $(M4_FILES)) SOURCE_BASE = $(filter-out %$(EMACS_BK_CHR) $(M4_FILES), \ $(call localize,$(call rwildcard,$(M4_BASEDIR)/,*))) +# Already macro-expanded rst files used to generate html +OLD_HTML_FILES := $(call localize,$(call rwildcard,$(HTML_SRCDIR)/,*)) -HTML_FILES := $(call localize,$(call rwildcard,$(HTML_SRCDIR)/,*)) - -LATEX_FILES := $(call localize,$(call rwildcard,$(LATEX_SRCDIR)/,*)) +# Already macro-expanded rst files used to generate latex +OLD_LATEX_FILES := $(call localize,$(call rwildcard,$(LATEX_SRCDIR)/,*)) # The html files to build and the directories that contain the files HTML_RST_FILES := \ @@ -229,13 +230,13 @@ destroy-sphinx-venv: ## html_rst Build RST files from m4 source for HTML generation .PHONY: html_rst html_rst: $(HTML_DIRS) $(HTML_RST_FILES) $(HTML_SRCDIR) - # Get rid of anything not a *.rst file, not already in the source + # Get rid of anything not a *.rst file, and that not in the source rm -rf \ $(filter-out \ $(HTML_RST_FILES) \ $(subst /$(STOCK_SRCDIR)/,/$(HTML_SRCDIR)/,$(SOURCE_BASE)) \ $(HTML_DIRS) \ - , $(HTML_FILES)) + , $(OLD_HTML_FILES)) # Populate a sourcedir for HTML output, without the RST files rsync -a --exclude='*.m4' --exclude='*$(EMACS_BK_CHR)' \ $(STOCK_SRCDIR)/ \ @@ -244,13 +245,13 @@ html_rst: $(HTML_DIRS) $(HTML_RST_FILES) $(HTML_SRCDIR) ## latex_rst Build RST files from m4 source for LaTeX generation .PHONY: latex_rst latex_rst: $(LATEX_DIRS) $(LATEX_RST_FILES) $(LATEX_SRCDIR) - # Get rid of anything not a *.rst file, not already in the source + # Get rid of anything not a *.rst file, and that not in the source rm -rf $(filter-out \ $(LATEX_RST_FILES) \ $(subst \ /$(STOCK_SRCDIR)/,/$(LATEX_SRCDIR)/,$(SOURCE_BASE)) \ $(LATEX_DIRS) \ - , $(LATEX_FILES)) + , $(OLD_LATEX_FILES)) # Populate a sourcedir for LATEX output, without the RST files rsync -a --exclude='*.m4' --exclude='*$(EMACS_BK_CHR)' \ $(STOCK_SRCDIR)/ \ -- 2.34.1