GNUmakefile.mjo,examples: renaming of sage listings

First, rename the variable to SAGE_LISTINGS for consistency. Then
change the existing sage_listing references to sage-listings. I've
decided that the hypgen looks better, and now it's up to the user.

diff --git a/GNUmakefile.mjo b/GNUmakefile.mjo
index 8578efa8329e55c982b708d4bf50a8a2f2e04fd9..177837d213ec3fa35e682dd0a8502d96cd5d87d9 100644 (file)
--- a/GNUmakefile.mjo
+++ b/GNUmakefile.mjo
@@ -21,7 +21,7 @@ PN ?= $(patsubst %.git,%,$(notdir $(realpath .)))
 # Compile a list of raw source code listings (*.listing) and their
 # associated output files (*.sage.py) that will be tested by check-sage.
 #
-# SAGE_LISTING_SRCS = $(wildcard sage_listings/*.listing)
+# SAGE_LISTINGS = $(wildcard sage-listings/*.listing)
 
 # A space-separated list of indices (just their names). Usually you'll
 # have just one, and it will be named the same thing as your document,
@@ -72,10 +72,10 @@ ifdef MJOTEX
 MJOTEXPATHS = $(shell kpsewhich $(MJOTEX))
 SRCS += $(MJOTEXPATHS)
 endif
-ifdef SAGE_LISTING_SRCS
+ifdef SAGE_LISTINGS
 SAGE_LISTING_DSTS = $(patsubst %.listing,\
                                $(BUILDDIR)/%.sage.py,\
-                               $(SAGE_LISTING_SRCS))
+                               $(SAGE_LISTINGS))
 SRCS += $(SAGE_LISTING_DSTS)
 endif
 

diff --git a/examples/GNUmakefile b/examples/GNUmakefile
index c499348a8a1bf3c4b9ec1a8b0bff16bfe0062ea7..06db99bf05ac2d7c20438b950a8536610ffabfc3 100644 (file)
--- a/examples/GNUmakefile
+++ b/examples/GNUmakefile
@@ -1,5 +1,6 @@
 #
-# Example makefile using mjotex and a BibTeX references database.
+# Example GNUmakefile using a BibTeX reference database, an index, and
+# some mjotex libraries.
 #
 # After defining $(PN) to be the name of your document, this will
 # compile the source file $(PN).tex to $(PN).pdf. The remaining
@@ -23,7 +24,7 @@ PN = examples
 # Specify the remaining variables only if you use them.
 BIBS = local-references.bib
 INDICES = $(PN)
-SAGE_LISTING_SRCS = $(wildcard sage_listings/*.listing)
+SAGE_LISTINGS = $(wildcard sage-listings/*.listing)
 
 # Only the ones we use... AKA all of them.
 MJOTEX  = mjo-algebra.tex mjo-algorithm.tex mjo-arrow.tex mjo-calculus.tex

diff --git a/examples/sage_listings/example.listing b/examples/sage-listings/example.listing
similarity index 100%
rename from examples/sage_listings/example.listing
rename to examples/sage-listings/example.listing