X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=GNUmakefile;h=4474d2f63882e4b7f0b62ae14016a917b9f12125;hb=4fd0c97de0370110d6fecab412ec1b5b831611e8;hp=331c65cd70c266c3cef55ca9a6ed7278b1a94bee;hpb=2c7065edf41d17ede36fc608b7a3749bb217ce19;p=mjotex.git

diff --git a/GNUmakefile b/GNUmakefile
index 331c65c..4474d2f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -11,16 +11,17 @@ PN = examples
 # A space-separated list of bib files. These must all belong to paths
 # contained in your $BIBINPUTS environment variable.
 #
-# Leave commented if you don't use a bibliography file.
+# Leave commented if you don't use a bibliography database.
 #
 #BIBS = 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.
-MJOTEX  = mjo-algorithm.tex mjo-arrow.tex mjo-common.tex mjo-cone.tex
-MJOTEX += mjo-convex.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
+MJOTEX  = mjo-algorithm.tex mjo-arrow.tex mjo-calculus.tex mjo-common.tex
+MJOTEX += mjo-complex.tex mjo-cone.tex mjo-convex.tex mjo-font.tex
+MJOTEX += 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
 
 # Use kpsewhich (from the kpathsea suite) to find the absolute paths
 # of the bibtex/mjotex files listed in in $(BIBS)/$(MJOTEX). The SRCS
@@ -98,7 +99,7 @@ $(PN).aux: $(SRCS)
 
 # 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 rebuild. This in turn causes
+# $(PN).aux, and thus $(PN).bbl would be rebuilt. This in turn causes
 # $(PN).pdf to appear out-of-date, which leads to a recompilation of
 # $(PN).tex... and so on. The order-only dependency means we won't
 # rebuild $(PN).bbl if $(PN).aux changes.
@@ -108,7 +109,9 @@ $(PN).aux: $(SRCS)
 #
 # If the $BIBS variable is undefined, we presume that there are no
 # references and create an empty bbl file. Otherwise, we risk trying
-# to run biblatex on an aux file containing no citations.
+# to run biblatex on an aux file containing no citations. If you do
+# define $BIBS but don't cite anything, you'll run into a similar
+# problem. Don't do that.
 #
 $(PN).bbl: $(SRCS) | $(PN).aux
 ifdef BIBS
@@ -117,17 +120,44 @@ else
 	echo -n '' > $@
 endif
 
+# If the output PDF exists but the log file does not, then an attempt
+# to "build the log file" (i.e. build the PDF) would do nothing. Thus
+# whenever the log file does not exist, we do a fresh build.
+$(PN).log: $(SRCS)
+	$(MAKE) clean
+	$(MAKE)
+
+# Ensure that there are no overfull or underfull boxes in the output
+# document by parsing the log for said warnings.
+.PHONY: check-boxes
+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.
+.PHONY: check-chktex
+CHKTEX = chktex --localrc .chktexrc --quiet --inputfiles=0
+check-chktex:
+	@[ -z "$(shell $(CHKTEX) mjotex.sty)" ]
+
+# Ensure that there are no undefined references in the document by
+# parsing the log file for said warnings.
+.PHONY: check-undefined
+check-undefined: $(PN).log
+	@! grep -i 'undefined' $<
+
+# Run a suite of checks.
 .PHONY: check
-check:
-	@[ -z "$(shell chktex --quiet mjotex.sty)" ]
+check: check-boxes check-chktex check-undefined
 
-# Clean up leftover junk.
+# 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 += snm spl toc xml
 .PHONY: clean
 clean:
-	rm -f *.{aux,bbl,bcf,bib,blg,listing,lof,log}
-	rm -f *.{nav,out,pdf,snm,spl,toc,xml}
+	for ext in $(JUNK_EXTENSIONS); do rm -f *.$$ext; done;
 	rm -rf dist/
 
 # If this document will be published, the publisher isn't going to