X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=912c309b482aff8851ffa8e4be9c0a94bb6ccf25;hb=HEAD;hp=7ca3bee39cf75852384922e81cc2d019bb92f335;hpb=71fe9a449493874b80afa86025743dec8dd4051b;p=ool%2Flipid_simulation_formalism.git

diff --git a/Makefile b/Makefile
index 7ca3bee..912c309 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/bin/make
 
-all: kinetic_formalism.pdf
+all: kinetic_formalism.pdf kinetic_formalism_competition.pdf
 
 R=R
 
@@ -16,15 +16,17 @@ R=R
 	bmeps -lpdf -olevel=1.4 $< $@
 
 %.tex: %.Rnw
-	$(R) CMD Sweave $<
+	$(R) --encoding=utf-8 -e "library('knitr'); knit('$<')"
 
 %.pdf: %.tex $(wildcard *.bib) $(wildcard *.tex)
-	rubber -fd $<
+	latexmk -f -pdf -pdflatex='xelatex -interaction=nonstopmode %O %S' -bibtex -use-make $<
 
-clean: 
-	rubber -d --clean *.tex
-	rm -f *.tmp
+clean:
+	latexmk -C
+	rm -f kinetic_formalism.tex kinetic_formalism_competition.tex
+	rm -rf cache
+	rm -f kinetic_formalism_competition.pdf kinetic_formalism.pdf
 
 .PHONY: clean all
 
-.DELETE_ON_ERROR: %.tex
\ No newline at end of file
+.DELETE_ON_ERROR: %.tex