Adapt to R CMD check --as-cran on R-devel, improve Makefile

git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/kinfit@264 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

3 files changed, 19 insertions, 18 deletions

diff --git a/DESCRIPTION b/DESCRIPTION
index 8dcbf47..9d99a93 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: kinfit

 Type: Package

 Title: Routines for fitting kinetic models to chemical degradation data

-Version: 1.1.13

-Date: 2014-12-18

+Version: 1.1.14

+Date: 2015-07-02

 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), 

                     email = "jranke@uni-bremen.de"),

              person("Katrin", "Lindenberger", role = "ctb"))

@@ -14,6 +14,7 @@ Description: Simple calculation routines based on the FOCUS Kinetics
  This package is not actively developed at the moment. Please check the mkin

  package for an actively maintained package for kinetic evaluations of

  degradation data

+Imports: graphics, stats, utils

 License: GPL

 LazyLoad: yes

 LazyData: yes

diff --git a/GNUmakefile b/GNUmakefile
index 833d2fc..8ab7153 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,17 +18,17 @@ SDDIR ?= $(RFSVN)/www/kinfit_static
 .PHONY: help
 
 pkgfiles = data/* \
-	   DESCRIPTION \
-	   inst/staticdocs/README \
-	   man/* \
-	   NAMESPACE \
-	   R/* \
-	   tests \
-           vignettes/header.tex \
-           vignettes/examples.Rnw \
-           vignettes/kinfit.Rnw \
-           vignettes/KinGUI/* \
-	   vignettes/references.bib
+	DESCRIPTION \
+	inst/staticdocs/README \
+	man/* \
+	NAMESPACE \
+	R/* \
+	tests \
+	vignettes/header.tex \
+	vignettes/examples.Rnw \
+	vignettes/kinfit.Rnw \
+	vignettes/KinGUI/* \
+	vignettes/references.bib
 
 all: check clean
 
@@ -70,11 +70,7 @@ vignettes/examples.pdf: vignettes/examples.Rnw
 vignettes: vignettes/examples.pdf vignettes/kinfit.pdf
 
 sd:
-	"$(RBIN)/Rscript" -e "library(staticdocs); build_site()"
-
-move-sd: sd
-	rm -f $(SDDIR)/{*.html,css/*.css,img/*.png,js/*.js,vignettes/*.pdf,vignettes/*.html};\
-	cp -r inst/web/* $(SDDIR); cd $(SDDIR) && svn add --force .
+	"$(RBIN)/Rscript" -e "library(staticdocs); build_site(site_path = '$(SDDIR)')"
 
 clean: 
 	$(RM) -r $(PKGNAME).Rcheck/
diff --git a/NAMESPACE b/NAMESPACE
index cd24e63..6183810 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -3,3 +3,7 @@
 

 # Export all names

 exportPattern(".")

+

+import("graphics")

+import("stats")

+importFrom("utils", "packageVersion", "write.table")