updated makefile and .gitignore to us latexmk instead of rubber

diff --git a/letter_template/.gitignore b/letter_template/.gitignore
new file mode 100644 (file)
index 0000000..69e1873
--- /dev/null
+++ b/letter_template/.gitignore
@@ -0,0 +1,12 @@
+/auto/
+/vc
+/refs-processed.bib
+/*.aux
+/*.bbl
+/*.blg
+/*.log
+/*.out
+/*.pdf
+/*.fdb_latexmk
+/*.fls
+/*.ttt

diff --git a/letter_template/Makefile b/letter_template/Makefile
index aecabff3e32bc9ac9c22976ad91935530f1fdf4c..237689e12fdb793886cf72fc243acba5bd6b0ce4 100644 (file)
--- a/letter_template/Makefile
+++ b/letter_template/Makefile
@@ -1,21 +1,21 @@
 #!/usr/bin/make
 
 all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
-pdf: all
 
-%.pdf: %.tex
-       rubber -fd $<
+%.pdf: %.tex 
+       latexmk -f -pdf $<
 
 clean: 
-       rubber -d --clean *.tex
+       latexmk -C *.tex
        rm -f *.tmp
-       rm -f figures/*.pdf
+       rm -f vc
 
 viewpdf: all
        evince *.pdf
 
-spell:
-       aspell -c -t --tex-check-comments -b text.tex
+vc:
+       vc-git
 
+pdf: all
 
 .PHONY: clean all

diff --git a/paper_template/.gitignore b/paper_template/.gitignore
index d9fa36070a176616c2df77ef3279d901f59a6ec4..7599c732ad04af1c29d8147d121d9f3fe70ee86c 100644 (file)
--- a/paper_template/.gitignore
+++ b/paper_template/.gitignore
@@ -1,4 +1,5 @@
 /auto/
+/cache/
 /vc
 /refs-processed.bib
 /*.aux
@@ -7,3 +8,6 @@
 /*.log
 /*.out
 /*.pdf
+/*.fdb_latexmk
+/*.fls
+/*.ttt

diff --git a/paper_template/Makefile b/paper_template/Makefile
index 29384c853eac5697281da5c916d5ad59b9474b90..f03bafeb4af1994df459f7c44dba01a1ea1c972a 100644 (file)
--- a/paper_template/Makefile
+++ b/paper_template/Makefile
@@ -1,7 +1,11 @@
 #!/usr/bin/make
 
 all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
-pdf: all
+
+# use the following section for Rnw/knitr documents
+# all: $(patsubst %.Rnw,%.pdf,$(wildcard *.Rnw))
+# %.tex: %.Rnw
+#      Rscript -e "library(knitr); knit('$<')"
 
 refs-processed.bib: 
        perl -p -e 's/©//' refs.bib > refs-processed.bib
@@ -9,21 +13,23 @@ refs-processed.bib:
        recode -d u8..ltex < refs-processed.bib | sponge refs-processed.bib
 
 %.pdf: %.tex refs-processed.bib
-       rubber -fd $<
+       latexmk -f -pdf $<
 
 clean: 
-       rubber -d --clean *.tex
+       latexmk -C *.tex
        rm -f *.tmp
        rm -f vc
        rm -f refs-processed.bib
+       # the following lines are useful for Rnw/knitr
+       # rm -rf cache/ figure/
+       # rm -f *.tex
 
 viewpdf: all
        evince *.pdf
 
-spell:
-       aspell -c -t --tex-check-comments -b text.tex
-
 vc:
        vc-git
 
+pdf: all
+
 .PHONY: clean all