Index: doc/theses/rob_schluntz/.gitignore
===================================================================
--- doc/theses/rob_schluntz/.gitignore	(revision 11b70289f1f0eeb9ac59bf49746042b66f1f5922)
+++ doc/theses/rob_schluntz/.gitignore	(revision b2b44d808ae1e94cb906efa6dd7aebd115204e3b)
@@ -1,5 +1,17 @@
 # generated by latex
-build/*
+*.aux
+*.bbl
+*.blg
+*.brf
+*.dvi
+*.idx
+*.ilg
+*.ind
+*.log
+*.out
 *.pdf
 *.ps
-
+*.toc
+*.lof
+*.lot
+*.synctex.gz
Index: doc/theses/rob_schluntz/Makefile
===================================================================
--- doc/theses/rob_schluntz/Makefile	(revision 11b70289f1f0eeb9ac59bf49746042b66f1f5922)
+++ doc/theses/rob_schluntz/Makefile	(revision b2b44d808ae1e94cb906efa6dd7aebd115204e3b)
@@ -1,25 +1,17 @@
-Build = build
-Macros = ../../LaTeXmacros
-TeXLIB = .:${Macros}:${Build}:../../bibliography:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && pdflatex -halt-on-error -output-directory=${Build}
+TeXLIB = .:../LaTeXmacros:../bibliography/:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && pdflatex -halt-on-error
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
-
-VPATH = ${Build}
 
 all : thesis.pdf
 
-thesis.pdf : Makefile ${Build} ${Macros}/common.tex cfa-format.tex thesis.tex intro.tex ctordtor.tex tuples.tex variadic.tex conclusions.tex
+thesis.pdf : Makefile ../LaTeXmacros/common.tex cfa-format.tex thesis.tex intro.tex ctordtor.tex tuples.tex variadic.tex conclusions.tex
 	${LaTeX} thesis
-	${BibTeX} ${Build}/thesis
+	${BibTeX} thesis
 	${LaTeX} thesis
 	${LaTeX} thesis
-	cp -p ${Build}/thesis.pdf .
 	pdf2ps thesis.pdf thesis.ps
 
-${Build}:
-	mkdir -p ${Build}
-
 clean :
-	@rm -frv ${Build}
+	rm -f *.aux *.bbl *.blg *.lof *.log *.lot *.out *.toc
 
 spotless : clean
Index: doc/theses/rob_schluntz/intro.tex
===================================================================
--- doc/theses/rob_schluntz/intro.tex	(revision 11b70289f1f0eeb9ac59bf49746042b66f1f5922)
+++ doc/theses/rob_schluntz/intro.tex	(revision b2b44d808ae1e94cb906efa6dd7aebd115204e3b)
@@ -290,5 +290,5 @@
 \end{cfacode}
 Every if- and iteration-statement in C compares the condition with @0@, and every increment and decrement operator is semantically equivalent to adding or subtracting the value @1@ and storing the result.
-Due to these rewrite rules, the values @0@ and @1@ have the types \zero and \one in \CFA, which allow for overloading various operations that connect to @0@ and @1@ \footnote{In the original design of \CFA, @0@ and @1@ were overloadable names \cite[p.~7]{cforall-refrat}.}.
+Due to these rewrite rules, the values @0@ and @1@ have the types \zero and \one in \CFA, which allow for overloading various operations that connect to @0@ and @1@ \footnote{In the original design of \CFA, @0@ and @1@ were overloadable names \cite[p.~7]{cforall}.}.
 The types \zero and \one have special built-in implicit conversions to the various integral types, and a conversion to pointer types for @0@, which allows standard C code involving @0@ and @1@ to work as normal.
 \begin{cfacode}
Index: doc/theses/rob_schluntz/thesis.tex
===================================================================
--- doc/theses/rob_schluntz/thesis.tex	(revision 11b70289f1f0eeb9ac59bf49746042b66f1f5922)
+++ doc/theses/rob_schluntz/thesis.tex	(revision b2b44d808ae1e94cb906efa6dd7aebd115204e3b)
@@ -288,5 +288,5 @@
 \addcontentsline{toc}{chapter}{\textbf{References}}
 
-\bibliography{pl,thesis}
+\bibliography{cfa,thesis}
 % Tip 5: You can create multiple .bib files to organize your references.
 % Just list them all in the \bibliogaphy command, separated by commas (no spaces).