Index: doc/theses/thierry_delisle/Makefile
===================================================================
--- doc/theses/thierry_delisle/Makefile	(revision 728df66bde6df9b1ca4ad068be30ea89605f46a3)
+++ doc/theses/thierry_delisle/Makefile	(revision 23c27039d154516f4cb778bd20b2ac74a513ba2e)
@@ -1,7 +1,13 @@
-## Define the appropriate configuration variables.
+## Define the configuration variables.
 
-TeXLIB = .:./style:./text:./annex:./build:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:/usr/local/bibliographies:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=build -interaction=nonstopmode
+Build = build
+Figures = figures
+Macros = ../../LaTeXmacros
+TeXLIB = .:style:text:annex:${Macros}:${Build}:../../bibliography:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex -terse
+
+MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -24,15 +30,15 @@
 }
 
-FIGURES = ${addprefix build/, ${addsuffix .tex, \
-	monitor \
-	ext_monitor \
-	int_monitor \
-	dependency \
-}}
+FIGURES = ${addsuffix .tex, \
+monitor \
+ext_monitor \
+int_monitor \
+dependency \
+}
 
-PICTURES = ${addprefix build/, ${addsuffix .pstex, \
-	system \
-	monitor_structs \
-}}
+PICTURES = ${addsuffix .pstex, \
+system \
+monitor_structs \
+}
 
 PROGRAMS = ${addsuffix .tex, \
@@ -48,79 +54,49 @@
 # Directives #
 
+.PHONY : all clean					# not file names
+
 all : ${DOCUMENT}
 
 clean :
-	@rm -fv ${DOCUMENT} \
-	build/*.acn     \
-	build/*.acr     \
-	build/*.alg     \
-	build/*.aux     \
-	build/*.bbl     \
-	build/*.blg     \
-	build/*.brf     \
-	build/*.cf      \
-	build/*.dvi     \
-	build/*.glg     \
-	build/*.glo     \
-	build/*.gls     \
-	build/*.ist     \
-	build/*.idx     \
-	build/*.ilg     \
-	build/*.ind     \
-	build/*.log     \
-	build/*.out     \
-	build/*.ps      \
-	build/*.pstex   \
-	build/*.pstex_t \
-	build/*.tex     \
-	build/*.toc     \
-	build/*.lof     \
-	build/*.lol     \
-	build/*.lot     \
-	figures/*.tex   \
-	*.png           \
-
+	@rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
 
 # File Dependencies #
 
-${DOCUMENT} : build/${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${basename ${DOCUMENT}}.ps
 	ps2pdf $<
 
-build/${basename ${DOCUMENT}}.ps : build/${basename ${DOCUMENT}}.dvi
-	dvips $< -o $@
+${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
+	dvips ${Build}/$< -o $@
 
-build/${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle annex/local.bib
-
-	@ if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi 				# Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
-	@ echo "Citation lookup"											# Must have *.aux file containing citations for bibtex
-	@ if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename ${notdir $@}}.tex ; fi
-	@ echo "Citation Pass 1"
-	@ -${BibTeX} ${basename $@}											# Some citations reference others so run steps again to resolve these citations
-	@ echo "Citation Pass 2"
-	@ ${LaTeX} ${basename ${notdir $@}}.tex
-	@ -${BibTeX} ${basename $@}
-	@ echo "Glossary"
-	@ makeglossaries -q -s ${basename $@}.ist ${basename $@}						# Make index from *.aux entries and input index at end of document
-	@ echo ".dvi generation"
-	@ -build/bump_ver.sh
-	@ ${LaTeX} ${basename ${notdir $@}}.tex									# Run again to get index title into table of contents
-
-
-predefined :
-	sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+		${Macros}/common.tex ${Macros}/indexstyle annex/local.bib ../../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 $@}
+	# Make index from *.aux entries and input index at end of document
+	makeglossaries -q -s ${Build}/${basename $@}.ist ${Build}/${basename $@}
+	-version.sh
+	# Run again to finish citations
+	${LaTeX} ${basename $@}.tex
 
 ## Define the default recipes.
 
-build/%.tex : figures/%.fig
-	fig2dev -L eepic $< > $@
+${Build}:
+	mkdir -p ${Build}
 
-build/%.ps : figures/%.fig
-	fig2dev -L ps $< > $@
+%.tex : %.fig
+	fig2dev -L eepic $< > ${Build}/$@
 
-build/%.pstex : figures/%.fig
-	fig2dev -L pstex $< > $@
-	fig2dev -L pstex_t -p $@ $< > $@_t
+%.ps : %.fig
+	fig2dev -L ps $< > ${Build}/$@
 
-figures/%.tex: build/%.pstex
+%.pstex : %.fig
+	fig2dev -L pstex $< > ${Build}/$@
+	fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
+
+%.tex: %.pstex
 	echo -n 	"\documentclass[preview]{standalone}\n" 	\
 			"\usepackage[T1]{fontenc}\n" 			\
@@ -134,5 +110,5 @@
 			"\end{document}" > $@
 
-%.png : build/%.pstex figures/%.tex
+%.png : %.pstex %.tex
 	echo ${basename $@}
 	${LaTeX} figures/${basename $@}.tex
@@ -141,6 +117,4 @@
 	convert -negate ${basename $@}.pdf $@
 
-
-
 # Local Variables: #
 # compile-command: "make" #
Index: doc/theses/thierry_delisle/build/bump_ver.sh
===================================================================
--- doc/theses/thierry_delisle/build/bump_ver.sh	(revision 728df66bde6df9b1ca4ad068be30ea89605f46a3)
+++ 	(revision )
@@ -1,6 +1,0 @@
-#!/bin/bash
-if [ ! -f version ]; then
-    echo "0.0.0" > version
-fi
-
-sed -r 's/([0-9]+\.[0-9]+.)([0-9]+)/echo "\1\$((\2+1))" > version/ge' version > /dev/null
Index: doc/theses/thierry_delisle/version
===================================================================
--- doc/theses/thierry_delisle/version	(revision 728df66bde6df9b1ca4ad068be30ea89605f46a3)
+++ doc/theses/thierry_delisle/version	(revision 23c27039d154516f4cb778bd20b2ac74a513ba2e)
@@ -1,1 +1,1 @@
-0.11.403
+0.11.409
Index: doc/theses/thierry_delisle/version.sh
===================================================================
--- doc/theses/thierry_delisle/version.sh	(revision 23c27039d154516f4cb778bd20b2ac74a513ba2e)
+++ doc/theses/thierry_delisle/version.sh	(revision 23c27039d154516f4cb778bd20b2ac74a513ba2e)
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ ! -f version ]; then
+    echo "0.0.0" > version
+fi
+
+sed -r 's/([0-9]+\.[0-9]+.)([0-9]+)/echo "\1\$((\2+1))" > version/ge' version > /dev/null