X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=GNUmakefile;h=e9b7d117fbab72fb5ceda2edf6ea6ec28d54c205;hb=93c8209c75f02b41fe26c7d58dd7b8f8814051f0;hp=49cca6a6cc4aff1a4acee75c6d8017e25ce61bb7;hpb=71b85fe2012cdf733f6e72137038d7d9960ddf08;p=mjotex.git

diff --git a/GNUmakefile b/GNUmakefile
index 49cca6a..e9b7d11 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -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.
@@ -166,9 +175,10 @@ $(PN).log: $(SRCS)
 	$(MAKE)
 
 # How do we convert a raw listing into something testable by sage? We
-# append/prepend triple quotes to make the whole thing into a doctest.
+# append/prepend triple quotes to make the whole thing into a doctest,
+# and then we replace any blank lines by "<BLANKLINE>".
 sage_listings/%.py: sage_listings/%.listing
-	echo '"""' > $@ && cat $< >> $@ && echo '"""' >> $@
+	echo '"""' > $@ && cat $< >> $@ && echo '"""' >> $@ && sed -i 's/^[[:space:]]*$$/<BLANKLINE>/' $@
 
 # Ensure that there are no overfull or underfull boxes in the output
 # document by parsing the log for said warnings.
@@ -177,7 +187,7 @@ check-boxes: $(PN).log
 	@! grep -i 'overfull\|underfull' $<
 
 # Run chktex to find silly mistakes. There is some exit code weirdness
-# (Savannah bug 45979), so we just look for empty output.
+# (Savannah bug 53129), so we just look for empty output.
 .PHONY: check-chktex
 CHKTEX = chktex --localrc .chktexrc --quiet --inputfiles=0
 check-chktex:
@@ -208,13 +218,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