X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjotex.git;a=blobdiff_plain;f=GNUmakefile;h=3f941fbeab7dd637502a99481e73c497dad57aeb;hp=75f4677aca1206fcacc477857ba5ff317c036a77;hb=f9205a3b883c08499edfdd3f9d1a6170a6fc6755;hpb=82229a995d230eef3f3d75d4fa893a604d183fbb

diff --git a/GNUmakefile b/GNUmakefile
index 75f4677..3f941fb 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -28,7 +28,7 @@ BIBS = local-references.bib
 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-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-proof_by_cases.tex mjo-set.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
@@ -63,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.
@@ -100,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 \
@@ -136,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.
@@ -172,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.
@@ -183,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:
@@ -202,9 +206,7 @@ check-undefined: $(PN).log
 .PHONY: check-sage
 check-sage: $(SAGE_LISTING_DSTS)
 ifdef SAGE_LISTING_DSTS
-	PYTHONPATH="$(HOME)/src/sage.d" \
-          sage -t --timeout=0 --memlimit=0 \
-          $^
+	sage -t --timeout=0 --memlimit=0 $^
 endif
 
 # Run a suite of checks.