[Rcpp-commits] r2462 - in pkg/RcppArmadillo: . R inst/skeleton

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-11-19 09:23:17 +0100 (Fri, 19 Nov 2010)
New Revision: 2462

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/R/RcppArmadillo.package.skeleton.R
   pkg/RcppArmadillo/inst/skeleton/Makevars
Log:
update RcppArmadillo's skeleton generator

Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2010-11-19 07:35:23 UTC (rev 2461)
+++ pkg/RcppArmadillo/ChangeLog	2010-11-19 08:23:17 UTC (rev 2462)
@@ -1,3 +1,10 @@
+2010-11-19  Romain Francois <romain at r-enthusiasts.com>
+
+	* DESCRIPTION: remove dependency on GNU make
+	
+	* R/RcppArmadillo.package.skeleton.R: updated skeleton generator so that the 
+	dependency on GNU make is removed
+
 2010-11-11  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.2.9

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2010-11-19 07:35:23 UTC (rev 2461)
+++ pkg/RcppArmadillo/DESCRIPTION	2010-11-19 08:23:17 UTC (rev 2462)
@@ -1,7 +1,7 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.2.9
+Version: 0.2.9.1
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel and Doug Bates
 Maintainer: Romain, Dirk and Doug <RcppArmadillo-authors at r-enthusiasts.com>
@@ -28,7 +28,7 @@
  capabilities of the Rcpp package for seamless R and C++ integration.
 License: GPL (>= 2)
 LazyLoad: yes
-Depends: R (>= 2.10.0), Rcpp (>= 0.8.6)
+Depends: R (>= 2.12.0), Rcpp (>= 0.8.8)
 LinkingTo: Rcpp
 Suggests: inline, RUnit
 URL: http://arma.sourceforge.net/, http://dirk.eddelbuettel.com/code/rcpp.armadillo.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/RcppArmadillo

Modified: pkg/RcppArmadillo/R/RcppArmadillo.package.skeleton.R
===================================================================
--- pkg/RcppArmadillo/R/RcppArmadillo.package.skeleton.R	2010-11-19 07:35:23 UTC (rev 2461)
+++ pkg/RcppArmadillo/R/RcppArmadillo.package.skeleton.R	2010-11-19 08:23:17 UTC (rev 2462)
@@ -60,12 +60,10 @@
 			"Depends" = sprintf( "Rcpp (>= %s), RcppArmadillo (>= %s) ", 
 				packageDescription("Rcpp")[["Version"]], 
 				packageDescription("RcppArmadillo")[["Version"]]), 
-			"LinkingTo" = "Rcpp, RcppArmadillo", 
-			"SystemRequirements" = "GNU make" )
+			"LinkingTo" = "Rcpp, RcppArmadillo" )
 		write.dcf( x, file = DESCRIPTION )
 		message( " >> added Depends: Rcpp, RcppArmadillo" )
 		message( " >> added LinkingTo: Rcpp, RcppArmadillo" )
-		message( " >> added SystemRequirements: GNU make" )
 	}
 	
 	# if there is a NAMESPACE, add a useDynLib

Modified: pkg/RcppArmadillo/inst/skeleton/Makevars
===================================================================
--- pkg/RcppArmadillo/inst/skeleton/Makevars	2010-11-19 07:35:23 UTC (rev 2461)
+++ pkg/RcppArmadillo/inst/skeleton/Makevars	2010-11-19 08:23:17 UTC (rev 2462)
@@ -1,3 +1,3 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)