Index: doc/papers/general/.gitignore
===================================================================
--- doc/papers/general/.gitignore	(revision a43dd549e90bdc806c0d76e79211059557128362)
+++ doc/papers/general/.gitignore	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
@@ -1,19 +1,4 @@
 # generated by latex
-*.aux
-*.bbl
-*.blg
-*.brf
-*.dvi
-*.idx
-*.ilg
-*.ind
-*.log
-*.out
+build/*
 *.pdf
 *.ps
-*.toc
-*.lof
-*.lot
-*.synctex.gz
-comment.cut
-timing.tex
Index: doc/papers/general/Makefile
===================================================================
--- doc/papers/general/Makefile	(revision a43dd549e90bdc806c0d76e79211059557128362)
+++ doc/papers/general/Makefile	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
@@ -2,10 +2,12 @@
 
 Build = build
+Figures = figures
 Macros = ../../LaTeXmacros
 TeXLIB = .:${Macros}:${Build}:../../bibliography:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build} -interaction=nonstopmode
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 
 MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Figures} evaluation
 
 ## Define the text source files.
@@ -34,5 +36,5 @@
 # Directives #
 
-.PHONY : all clean										# not file names
+.PHONY : all clean					# not file names
 
 all : ${DOCUMENT}
@@ -50,34 +52,33 @@
 
 ${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
-			${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/cfa.bib
-	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi # Must have *.aux file containing citations for bibtex
-	-${BibTeX} ${Build}/${basename $@}					# Some citations reference others so run again to resolve these citations
+		${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/pl.bib
+	# 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
 	${LaTeX} ${basename $@}.tex
 	-${BibTeX} ${Build}/${basename $@}
-	${LaTeX} ${basename $@}.tex							# Finish citations
+	# Run again to finish citations
+	${LaTeX} ${basename $@}.tex
 
 ## Define the default recipes.
-
-vpath %.tex ${subst .zzz,,${subst .zzz ,:,${SOURCES}}}	# add prefix for source
-vpath %.fig ${subst .zzz,,${subst .zzz ,:,${SOURCES}}}	# add prefix for source
 
 ${Build}:
 	mkdir -p ${Build}
 
-${GRAPHS} : evaluation/timing.gp evaluation/timing.dat
-	gnuplot evaluation/timing.gp
+${GRAPHS} : timing.gp timing.dat
+	gnuplot -e Build="'${Build}/'" evaluation/timing.gp
 
-%.tex : figures/%.fig
+%.tex : %.fig
 	fig2dev -L eepic $< > ${Build}/$@
 
-%.ps : figures/%.fig
+%.ps : %.fig
 	fig2dev -L ps $< > ${Build}/$@
 
-%.pstex : figures/%.fig
+%.pstex : %.fig
 	fig2dev -L pstex $< > ${Build}/$@
 	fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 
 # Local Variables: #
-# tab-width : 4 #
 # compile-command: "make" #
 # End: #
Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision a43dd549e90bdc806c0d76e79211059557128362)
+++ doc/papers/general/Paper.tex	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
@@ -1095,5 +1095,5 @@
 
 \bibliographystyle{plain}
-\bibliography{cfa}
+\bibliography{pl}
 
 
Index: doc/papers/general/evaluation/timing.gp
===================================================================
--- doc/papers/general/evaluation/timing.gp	(revision a43dd549e90bdc806c0d76e79211059557128362)
+++ doc/papers/general/evaluation/timing.gp	(revision 5ff188f3cd236584cfa7f3b12ea210fdd51bde8a)
@@ -2,5 +2,5 @@
 # set output "timing.pdf"
 set terminal pslatex size 6.25,2.125 color solid
-set output "timing.tex"
+set output Build."timing.tex"
 
 set pointsize 2.0