[Rcpp-commits] r1350 - in pkg: Rcpp/R RcppArmadillo/R

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

Author: romain
Date: 2010-05-28 18:07:41 +0200 (Fri, 28 May 2010)
New Revision: 1350

Modified:
   pkg/Rcpp/R/inline.R
   pkg/RcppArmadillo/R/inline.R
Log:
pull Makevars and Makevars.win from skeleton so that we do not have yet another copy

Modified: pkg/Rcpp/R/inline.R
===================================================================
--- pkg/Rcpp/R/inline.R	2010-05-28 15:55:58 UTC (rev 1349)
+++ pkg/Rcpp/R/inline.R	2010-05-28 16:07:41 UTC (rev 1350)
@@ -15,20 +15,15 @@
 # You should have received a copy of the GNU General Public License
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-Makevars.Rcpp <- '
-## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
-'
-
-Makevars.win.Rcpp <- '
-## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
-'
-
-Rcpp.plugin.maker <- function( include.before = "", include.after = "", 
-	LinkingTo = "Rcpp", Depends = "Rcpp", libs = "", 
-	Makevars = Makevars.Rcpp, 
-	Makevars.win = Makevars.win.Rcpp
+Rcpp.plugin.maker <- function( 
+	include.before = "", 
+	include.after = "", 
+	LinkingTo     = unique( c( package, "Rcpp" ) ), 
+	Depends       = unique( c( package, "Rcpp" ) ), 
+	libs          = "", 
+	Makevars      = readLines( system.file("skeleton", "Makevars"    , package = package ) ) , 
+	Makevars.win  = readLines( system.file("skeleton", "Makevars.win", package = package ) ), 
+	package       = "Rcpp"
 ){
 	function( ... ){
 includes <- sprintf( "%s

Modified: pkg/RcppArmadillo/R/inline.R
===================================================================
--- pkg/RcppArmadillo/R/inline.R	2010-05-28 15:55:58 UTC (rev 1349)
+++ pkg/RcppArmadillo/R/inline.R	2010-05-28 16:07:41 UTC (rev 1350)
@@ -15,18 +15,9 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
 
-Makevars.RcppArmadillo <- '
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-'
-Makevars.win.RcppArmadillo <- '
-PKG_LIBS = $(shell $(R_HOME)/bin${R_ARCH_BIN}/Rscript.exe -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-'
-
 inline_cxx_plugin <- Rcpp:::Rcpp.plugin.maker(
 	include.before = "#include <RcppArmadillo.h>", 
-	LinkingTo = c("Rcpp", "RcppArmadillo"), 
-	Depends = c("Rcpp", "RcppArmadillo"),
-	libs = "$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", 
-	Makevars = Makevars.RcppArmadillo, 
-	Makevars.win = Makevars.win.RcppArmadillo
+	libs           = "$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", 
+	package        = "RcppArmadillo"
 )
+