X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=GNUmakefile;h=a2e2ec2159831a93b9b1eb787df356162206e2f9;hb=f114f14b8b351c58103bc0f55f69778175ab57b6;hp=fba3b3799ec64f9199ca8204aa5f444a759591db;hpb=bcef6c6339823ec1d823af1246cfb26eec0f9b52;p=mjotex.git

diff --git a/GNUmakefile b/GNUmakefile
index fba3b37..a2e2ec2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,6 +6,11 @@
 LATEX = pdflatex -file-line-error -halt-on-error
 
 # The name of this document.
+#
+# For example, to use the name of our parent directory:
+#
+# PN = $(notdir $(realpath .))
+#
 PN = examples
 
 # A space-separated list of bib files. These must all belong to paths
@@ -22,15 +27,17 @@ PN = examples
 #
 MJOTEX  = mjo-algebra.tex mjo-algorithm.tex mjo-arrow.tex mjo-calculus.tex
 MJOTEX += mjo-common.tex mjo-complex.tex mjo-cone.tex mjo-convex.tex
-MJOTEX += mjo-font.tex mjo-linear_algebra.tex mjo-listing.tex mjo-misc.tex
-MJOTEX += mjo-proof_by_cases.tex mjo-theorem.tex mjo-theorem-star.tex
-MJOTEX += mjo-topology.tex mjo.bst
+MJOTEX += mjo-eja.tex mjo-font.tex mjo-linear_algebra.tex mjo-listing.tex
+MJOTEX += mjo-misc.tex mjo-proof_by_cases.tex mjo-theorem.tex
+MJOTEX += mjo-theorem-star.tex mjo-topology.tex mjo.bst
 
 # Compile a list of raw source code listings (*.listing) and their
 # associated output files (*.py) that will be tested by check-sage.
 SAGE_LISTING_SRCS = $(wildcard sage_listings/*.listing)
 SAGE_LISTING_DSTS = $(patsubst %.listing,%.py,$(SAGE_LISTING_SRCS))
 
+INDICES = $(PN)
+
 # Use kpsewhich (from the kpathsea suite) to find the absolute paths
 # of the bibtex/mjotex files listed in in $(BIBS)/$(MJOTEX). The SRCS
 # variable should contain all (Bib)TeX source files for the document.
@@ -43,7 +50,15 @@ ifdef MJOTEX
 MJOTEXPATHS = $(shell kpsewhich $(MJOTEX))
 SRCS += $(MJOTEXPATHS)
 endif
+ifdef SAGE_LISTING_DSTS
+SRCS += $(SAGE_LISTING_DSTS)
+endif
 
+ifdef INDICES
+INDEX_SRCS = $(addsuffix .idx,$(INDICES))
+INDEX_DSTS = $(addsuffix .ind,$(INDICES))
+SRCS += $(INDEX_DSTS)
+endif
 
 # The first target is the default, so put the PDF document first.
 #
@@ -105,6 +120,21 @@ $(PN).aux: $(SRCS)
 	$(LATEX) $(PN).tex
 
 
+ifdef INDICES
+# We need to be able to build the index source files without involving
+# the main $(PN).pdf rule, in order to avoid a chicken-and-egg problem.
+# This is similar to the $(PN).aux rule above, except that an index is
+# optional and there might be more than one of them.
+$(INDEX_SRCS): $(PN).tex
+	$(LATEX) $(PN).tex
+endif
+
+ifdef INDICES
+# Create real indices from source files by running "makeindex" on them.
+%.ind: %.idx
+	makeindex $<
+endif
+
 # The pipe below indicates an "order-only dependency" on the aux file.
 # Without it, every compilation of $(PN).tex would produce a new
 # $(PN).aux, and thus $(PN).bbl would be rebuilt. This in turn causes