GNUmakefile: oops, fix the index generation again.

[mjotex.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index a2e2ec2159831a93b9b1eb787df356162206e2f9..3456c4d9c2f396d439345805b109ff52d3f6db75 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,7 +18,7 @@ PN = examples
 #
 # Leave commented if you don't use a bibliography database.
 #
-#BIBS = references.bib
+BIBS = local-references.bib
 
 # A space-separated list of the mjotex files that you use. The path to
 # mjotex must be contain in your $TEXINPUTS environment variable.
@@ -36,6 +36,12 @@ MJOTEX += mjo-theorem-star.tex mjo-topology.tex mjo.bst
 SAGE_LISTING_SRCS = $(wildcard sage_listings/*.listing)
 SAGE_LISTING_DSTS = $(patsubst %.listing,%.py,$(SAGE_LISTING_SRCS))
 
+# 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,
+# because that's what the makeidx package does.
+#
+# Leave commented if you don't use an index.
+#
 INDICES = $(PN)
 
 # Use kpsewhich (from the kpathsea suite) to find the absolute paths
@@ -57,7 +63,6 @@ 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.
@@ -94,7 +99,7 @@ endif
 # version of pdflatex makes it into TeX Live 2016, we can replace
 # those two sed scripts with something smarter.
 #
-$(PN).pdf: $(SRCS) $(PN).bbl
+$(PN).pdf: $(SRCS) $(PN).bbl $(INDEX_DSTS)
        $(LATEX) $(PN).tex
 
        sed --in-place \
@@ -130,9 +135,13 @@ $(INDEX_SRCS): $(PN).tex
 endif
 
 ifdef INDICES
-# Create real indices from source files by running "makeindex" on them.
-%.ind: %.idx
-       makeindex $<
+# Create real indices from source files by running "makeindex" on
+# them. We depend on SRCS here because we *do* want to rebuild the
+# index if the source document changes, but we use an order-only
+# dependency (see the bbl rule below) on the idx files to prevent us
+# from going into a rebuild loop when the idx files are regenerated.
+%.ind: $(SRCS) | %.idx
+       makeindex $|
 endif
 
 # The pipe below indicates an "order-only dependency" on the aux file.
@@ -208,13 +217,13 @@ check: check-boxes check-chktex check-undefined check-sage
 # Clean up leftover junk. This only looks overcomplicated because
 # the *.{foo,bar} syntax supported by Bash is not POSIX, and Make
 # will execute these commands using /bin/sh (which should be POSIX).
-JUNK_EXTENSIONS  = aux bbl bcf bib blg listing lof log nav out pdf
+JUNK_EXTENSIONS  = aux bbl bcf blg glo ilg ist listing lof log nav out pdf
 JUNK_EXTENSIONS += snm spl toc xml
 .PHONY: clean
 clean:
        for ext in $(JUNK_EXTENSIONS); do rm -f *.$$ext; done;
        rm -rf dist/
-       rm -f $(SAGE_LISTING_DSTS)
+       rm -f $(SAGE_LISTING_DSTS) $(INDEX_SRCS) $(INDEX_DSTS)
 
 # If this document will be published, the publisher isn't going to
 # have your BibTeX database or your mjotex files. So, you need to