diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2014-07-01 23:23:52 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2014-07-02 00:25:00 +0200 |
| commit | 71d43b104999d7aee96d35ff2a9006f739d2df60 (patch) | |
| tree | 88bf04296b028f94ee0c39b99ca48df57b18e973 /GNUmakefile | |
| parent | ddaa35ff58c8dcb04ef86723dccba0bfa97cf053 (diff) | |
Support formation fractions without sink pathway, updates
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 969b4ff0..693ec892 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -26,7 +26,7 @@ pkgfiles = NEWS \ TODO \ vignettes/* -all: NEWS check +all: NEWS check clean # convert markdown to R's NEWS format (from knitr package) NEWS: NEWS.md @@ -57,7 +57,12 @@ check: build "$(RBIN)/R" CMD check --as-cran --no-tests --no-build-vignettes $(TGZ) check-no-vignettes: build-no-vignettes - "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZVNR) + mv $(TGZVNR) $(TGZ) + "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) + mv $(TGZ) $(TGZVNR) + +clean: + $(RM) -r $(PKGNAME).Rcheck/ test: install-no-vignettes cd tests;\ @@ -74,9 +79,6 @@ move-sd: rm -rf $(SDDIR)/*;\ cp -r inst/web/* $(SDDIR) -#------------------------------------------------------------------------------ -# Packaging Tasks -#------------------------------------------------------------------------------ winbuilder: build date @echo "Uploading to R-release on win-builder" |