Merge branch 'master' into knitr

[cdsc_tex.git] / paper_template / Makefile

diff --git a/paper_template/Makefile b/paper_template/Makefile
index f03bafeb4af1994df459f7c44dba01a1ea1c972a..d7e66787a590c04afec660cccd987cfe48bd9a4b 100644 (file)
--- a/paper_template/Makefile
+++ b/paper_template/Makefile
@@ -1,35 +1,30 @@
 #!/usr/bin/make
 
-all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
+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('$<')"
+%.tex: %.Rnw
+       Rscript -e "library(knitr); knit('$<')"
 
-refs-processed.bib: 
-       perl -p -e 's/©//' refs.bib > refs-processed.bib
-       perl -0pe 's/,\s+(file|abstract) = \{.*?\}(,\n|\n)/\2/sg' refs-processed.bib |sponge refs-processed.bib
-       recode -d u8..ltex < refs-processed.bib | sponge refs-processed.bib
-
-%.pdf: %.tex refs-processed.bib
+%.pdf: %.tex 
        latexmk -f -pdf $<
 
 clean: 
        latexmk -C *.tex
-       rm -f *.tmp
+       rm -f *.tmp *.run.xml
        rm -f vc
-       rm -f refs-processed.bib
+       rm -f *.bbl
        # the following lines are useful for Rnw/knitr
-       # rm -rf cache/ figure/
-       # rm -f *.tex
+       rm -rf cache/ figure/
+       rm -f *.tex
 
 viewpdf: all
        evince *.pdf
 
-vc:
-       vc-git
+vc:    resources/vc-git
 
 pdf: all
 
 .PHONY: clean all
+.PRECIOUS: %.tex