Index: doc/papers/concurrency/Makefile
===================================================================
--- doc/papers/concurrency/Makefile	(revision 23c27039d154516f4cb778bd20b2ac74a513ba2e)
+++ doc/papers/concurrency/Makefile	(revision 0415e24ec530c161ec8bce654c8703de31df6ded)
@@ -3,10 +3,10 @@
 Build = build
 Figures = figures
-Macros = ../../LaTeXmacros
-TeXLIB = .:style:annex:${Macros}:${Build}:../../bibliography:
+Macros = AMA/AMA-stix/ama
+TeXLIB = .:style:annex:../../LaTeXmacros:${Macros}:${Build}:../../bibliography:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 
-MAKEFLAGS = --no-print-directory --silent #
+MAKEFLAGS = --no-print-directory # --silent
 VPATH = ${Build} ${Figures}
 
@@ -40,4 +40,5 @@
 
 DOCUMENT = Paper.pdf
+BASE = ${basename ${DOCUMENT}}
 
 # Directives #
@@ -48,22 +49,22 @@
 
 clean :
-	@rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
+	@rm -frv ${DOCUMENT} ${BASE}.ps WileyNJD-AMA.bst ${BASE}.out.ps ${Build}
 
 # File Dependencies #
 
-${DOCUMENT} : ${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${BASE}.ps
 	ps2pdf $<
 
-${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
+${BASE}.ps : ${BASE}.dvi
 	dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
-		${Macros}/common.tex ${Macros}/indexstyle annex/local.bib ../../bibliography/pl.bib
+${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+		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 $@}
+	${BibTeX} ${Build}/${basename $@}
 	# Some citations reference others so run again to resolve these citations
 	${LaTeX} ${basename $@}.tex
-	-${BibTeX} ${Build}/${basename $@}
+	${BibTeX} ${Build}/${basename $@}
 	# Run again to finish citations
 	${LaTeX} ${basename $@}.tex
@@ -73,4 +74,10 @@
 ${Build}:
 	mkdir -p ${Build}
+
+${BASE}.out.ps:
+	ln -fs build/Paper.out.ps .
+
+WileyNJD-AMA.bst:
+	ln -fs AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 
 %.tex : %.fig