Index: doc/papers/OOPSLA17/.gitignore
===================================================================
--- doc/papers/OOPSLA17/.gitignore	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
+++ doc/papers/OOPSLA17/.gitignore	(revision 1449d83d58f534d045be59bb9bcd5ecab96c5519)
@@ -1,4 +1,19 @@
 # generated by latex
-build/*
+*.aux
+*.bbl
+*.blg
+*.brf
+*.dvi
+*.idx
+*.ilg
+*.ind
+*.log
+*.out
 *.pdf
 *.ps
+*.toc
+*.lof
+*.lot
+*.synctex.gz
+comment.cut
+timing.tex
Index: doc/papers/OOPSLA17/Makefile
===================================================================
--- doc/papers/OOPSLA17/Makefile	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
+++ doc/papers/OOPSLA17/Makefile	(revision 1449d83d58f534d045be59bb9bcd5ecab96c5519)
@@ -1,13 +1,7 @@
-## Define the configuration variables.
+## Define the appropriate configuration variables.
 
-Build = build
-Figures = figures
-Macros = ../../LaTeXmacros
-TeXLIB = .:${Macros}:${Build}:../../bibliography:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
+TeXLIB = .:../LaTeXmacros:../LaTeXmacros/listings:../LaTeXmacros/enumitem:../bibliography/:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
-
-MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures} evaluation
 
 ## Define the text source files.
@@ -39,5 +33,6 @@
 
 clean :
-	@rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
+	rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf \
+		${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
 
 # File Dependencies #
@@ -47,33 +42,40 @@
 
 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
-	dvips ${Build}/$< -o $@
+	dvips $< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../bibliography/pl.bib
+#${DOCUMENT} : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+
+${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../bibliography/cfa.bib
+	# Conditionally create an empty *.idx (index) file for inclusion until makeindex is run.
+	if [ ! -r ${basename $@}.idx ] ; then touch ${basename $@}.idx ; fi
 	# Must have *.aux file containing citations for bibtex
 	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-	-${BibTeX} ${Build}/${basename $@}
-	# Some citations reference others so run again to resolve these citations
+	-${BibTeX} ${basename $@}
+	# Some citations reference others so run steps again to resolve these citations
 	${LaTeX} ${basename $@}.tex
-	-${BibTeX} ${Build}/${basename $@}
-	# Run again to finish citations
+	-${BibTeX} ${basename $@}
+	# Make index from *.aux entries and input index at end of document
+	makeindex -s ../LaTeXmacros/indexstyle ${basename $@}.idx
 	${LaTeX} ${basename $@}.tex
+	# Run again to get index title into table of contents
+	${LaTeX} ${basename $@}.tex
+
+predefined :
+	sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
 
 ## Define the default recipes.
 
-${Build}:
-	mkdir -p ${Build}
-
-${GRAPHS} : timing.gp timing.dat
-	gnuplot -e Build="'${Build}/'" evaluation/timing.gp
+${GRAPHS} : evaluation/timing.gp evaluation/timing.dat
+	gnuplot evaluation/timing.gp
 
 %.tex : %.fig
-	fig2dev -L eepic $< > ${Build}/$@
+	fig2dev -L eepic $< > $@
 
 %.ps : %.fig
-	fig2dev -L ps $< > ${Build}/$@
+	fig2dev -L ps $< > $@
 
 %.pstex : %.fig
-	fig2dev -L pstex $< > ${Build}/$@
-	fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
+	fig2dev -L pstex $< > $@
+	fig2dev -L pstex_t -p $@ $< > $@_t
 
 # Local Variables: #
Index: doc/papers/OOPSLA17/evaluation/timing.gp
===================================================================
--- doc/papers/OOPSLA17/evaluation/timing.gp	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
+++ doc/papers/OOPSLA17/evaluation/timing.gp	(revision 1449d83d58f534d045be59bb9bcd5ecab96c5519)
@@ -2,5 +2,5 @@
 # set output "timing.pdf"
 set terminal pslatex size 6.25,2.125 color solid
-set output Build."timing.tex"
+set output "timing.tex"
 
 set pointsize 2.0
Index: doc/papers/OOPSLA17/generic_types.tex
===================================================================
--- doc/papers/OOPSLA17/generic_types.tex	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
+++ doc/papers/OOPSLA17/generic_types.tex	(revision 1449d83d58f534d045be59bb9bcd5ecab96c5519)
@@ -1109,5 +1109,5 @@
 
 \bibliographystyle{ACM-Reference-Format}
-\bibliography{pl}
+\bibliography{cfa}