Merge branch 'master' into knitr

[cdsc_tex.git] / paper_template / Makefile

diff --git a/paper_template/Makefile b/paper_template/Makefile
index a831bb30cbf862bb0fb0a13884793c7b8469c54a..d7e66787a590c04afec660cccd987cfe48bd9a4b 100644 (file)
--- a/paper_template/Makefile
+++ b/paper_template/Makefile
@@ -1,29 +1,30 @@
 #!/usr/bin/make
 
 #!/usr/bin/make
 

-#all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
-all: project_description.pdf references.pdf
-pdf: all
+all: $(patsubst %.Rnw,%.pdf,$(wildcard *.Rnw)) 
+
+# use the following section for Rnw/knitr documents
+# all: $(patsubst %.Rnw,%.pdf,$(wildcard *.Rnw))
+%.tex: %.Rnw
+       Rscript -e "library(knitr); knit('$<')"

 
 

-%.pdf: %.tex
-       perl -p -e 's/©//' refs.bib > refs-cleaned.bib
-       perl -0pe 's/,\s+(file|abstract) = \{.*?\}(,\n|\n)/\2/sg' refs-cleaned.bib |sponge refs-cleaned.bib
-       recode -d u8..ltex < refs-cleaned.bib > refs-processed.bib
-       rubber -fd $<
+%.pdf: %.tex 
+       latexmk -f -pdf $<

 
 clean: 
 
 clean: 

-       rubber -d --clean *.tex
-       rm -f *.tmp
+       latexmk -C *.tex
+       rm -f *.tmp *.run.xml

        rm -f vc
        rm -f vc

-       rm -f refs-cleaned.bib
-       rm -f refs-processed.bib
+       rm -f *.bbl
+       # the following lines are useful for Rnw/knitr
+       rm -rf cache/ figure/
+       rm -f *.tex

 
 viewpdf: all
        evince *.pdf
 
 
 viewpdf: all
        evince *.pdf
 

-spell:
-       aspell -c -t --tex-check-comments -b text.tex
+vc:    resources/vc-git

 
 

-vc:
-       vc-git
+pdf: all

 
 .PHONY: clean all
 
 .PHONY: clean all

+.PRECIOUS: %.tex