From 8b94131388071980e62c17190eb4229e89975a0c Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 4 Dec 2013 10:25:14 +0100
Subject: Make it possible to use different ode solvers

---
 GNUmakefile | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 255b97f3..cf5c845e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -19,9 +19,13 @@ help:
 	@echo "  build                   Create the package"
 	@echo "  build-no-vignettes      Create the package without rebuilding vignettes"
 	@echo "  check                   Invoke build and then check the package"
+	@echo "  check-no-vignettes      Invoke build without rebuilding vignettes, and then check"
 	@echo "  install                 Invoke build and then install the result"
+	@echo "  install                 Invoke build without rebuilding vignettes and then install the result"
 	@echo "  test                    Install a new copy of the package and run it "
 	@echo "                          through the testsuite"
+	@echo "  test-no-vignettes       Invoke build without rebuilding vignettes, and then run it"
+	@echo "                          through the testsuite"
 	@echo ""
 	@echo "Packaging Tasks"
 	@echo "---------------"
@@ -44,15 +48,27 @@ build-no-vignettes:
 	cd ..;\
 		"$(RBIN)/R" CMD build $(PKGSRC) --no-build-vignettes
 
-install%: build%
+install: build
 	cd ..;\
 		"$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz
 
-check%: build%
+install-no-vignettes: build-no-vignettes
+	cd ..;\
+		"$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz
+
+check: build
+	cd ..;\
+		"$(RBIN)/R" CMD check --as-cran --no-tests $(PKGNAME)_$(PKGVERS).tar.gz
+
+check-no-vignettes: build-no-vignettes
 	cd ..;\
 		"$(RBIN)/R" CMD check --as-cran --no-tests $(PKGNAME)_$(PKGVERS).tar.gz
 
-test%: install%
+test: install
+	cd tests;\
+		"$(RBIN)/Rscript" doRUnit.R
+
+test-no-vignettes: install-no-vignettes
 	cd tests;\
 		"$(RBIN)/Rscript" doRUnit.R
 
-- 
cgit v1.2.1