From f3b3d82957b088986655075565abaa51d4ccbff7 Mon Sep 17 00:00:00 2001
From: Benjamin Mako Hill <mako@atdot.cc>
Date: Tue, 3 Nov 2015 09:26:44 -0800
Subject: [PATCH 1/1] updated makefile and .gitignore to us latexmk instead of
 rubber

---
 letter_template/.gitignore | 12 ++++++++++++
 letter_template/Makefile   | 14 +++++++-------
 paper_template/.gitignore  |  4 ++++
 paper_template/Makefile    | 18 ++++++++++++------
 4 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 letter_template/.gitignore

diff --git a/letter_template/.gitignore b/letter_template/.gitignore
new file mode 100644
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 aecabff..237689e 100644
--- 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 d9fa360..7599c73 100644
--- 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 29384c8..f03bafe 100644
--- 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
-- 
2.39.5