Fix inverse predictions for replicate measurements

For details, see NEWS.md

1 files changed, 29 insertions, 6 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 3f16fbc..7992c5e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -8,27 +8,44 @@ TGZ     := $(PKGNAME)_$(PKGVERS).tar.gz
 # If no alternate bin folder is specified, the default is to use the folder
 # containing the first instance of R on the PATH.
 RBIN ?= $(shell dirname "`which R`")
+#
+# Vignettes are listed in the build target
+pkgfiles = \
+  GNUmakefile \
+	.Rbuildignore \
+	data/* \
+	DESCRIPTION \
+	man/* \
+	NAMESPACE \
+	NEWS.md \
+	README.html \
+	R/* \
+	tests/* \
+	tests/testthat*
+
+all: build
+
+$(TGZ): $(pkgfiles) vignettes
+	"$(RBIN)/R" CMD build . 2>&1 | tee build.log
+
+build: $(TGZ)
 
 README.html: README.md
 	"$(RBIN)/Rscript" -e "rmarkdown::render('README.md', output_format = 'html_document')"
 
-build:
-	"$(RBIN)/R" CMD build .
-
 install: build
 	"$(RBIN)/R" CMD INSTALL $(TGZ)
 
 check: build
 	"$(RBIN)/R" CMD check --as-cran $(TGZ)
 
-vignettes/%.html: vignettes/%.Rmd
-	"$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/$*.Rnw', dir = 'vignettes')"
+vignettes/%.html: vignettes/%.Rmd vignettes/refs.bib
+	"$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/$*.Rmd', dir = 'vignettes')"
 
 vignettes: vignettes/chemCal.html
 
 pd:
 	"$(RBIN)/Rscript" -e "pkgdown::build_site()"
-	cp vignettes/chemCal.pdf docs/articles
 	git add -A
 	git commit -m 'Static documentation rebuilt by pkgdown::build_site()' -e
 
@@ -40,3 +57,9 @@ winbuilder: build
 
 test: install
 	NOT_CRAN=true "$(RBIN)/Rscript" -e 'devtools::test()'
+
+clean:
+	$(RM) -r vignettes/*_cache
+	$(RM) -r vignettes/*_files
+	$(RM) -r vignettes/*.R
+	$(RM) Rplots.pdf