diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-26 12:11:39 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-26 12:11:39 +0200 |
| commit | b60e5b27d3dde18fb93b486bc2fd45baf56e2ed1 (patch) | |
| tree | e4451f81a3e225647761a8f27a04d019648c0d1d /GNUmakefile | |
| parent | 4c69847346a9c254e4e803b6987a63e3fd9c14ae (diff) | |
More plotting in help files, fix Make- and .*ignore files
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index 1daff86e..19658a85 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -72,7 +72,7 @@ clean: $(RM) -r vignettes/*.syntex.gz $(RM) Rplots.pdf -test: install-no-vignettes +test: quickinstall cd tests;\ "$(RBIN)/Rscript" testthat.R 2>&1 | tee ../test.log @@ -82,12 +82,13 @@ vignettes/%.pdf: vignettes/header.tex vignettes/references.bib vignettes/%.Rnw vignettes/%.html: vignettes/mkin_vignettes.css vignettes/%.Rmd "$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/$*.Rmd', dir = 'vignettes')" -vignettes: install-no-vignettes vignettes/mkin.pdf vignettes/FOCUS_D.html vignettes/FOCUS_L.html vignettes/FOCUS_Z.pdf vignettes/compiled_models.html +vignettes: quickinstall vignettes/mkin.pdf vignettes/FOCUS_D.html vignettes/FOCUS_L.html vignettes/FOCUS_Z.pdf vignettes/compiled_models.html sd: rm -rf $(SDDIR)/* - "$(RBIN)/Rscript" -e "library(staticdocs); build_site(site_path = '$(SDDIR)')" - $(RM) $(SDDIR)/Rplots.pdf + @echo Now execute + @echo "\nlibrary(staticdocs); build_site(site_path = '$(SDDIR)')\n" + $(RBIN)/R cp -r figure $(SDDIR) r-forge: sd |