[Rcpp-commits] r960 - pkg/RcppArmadillo/src

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

Author: dmbates
Date: 2010-04-03 21:44:16 +0200 (Sat, 03 Apr 2010)
New Revision: 960

Added:
   pkg/RcppArmadillo/src/Makevars
Removed:
   pkg/RcppArmadillo/src/Makevars.in
Modified:
   pkg/RcppArmadillo/src/Makevars.win
Log:
No longer use a configure script

Added: pkg/RcppArmadillo/src/Makevars
===================================================================
--- pkg/RcppArmadillo/src/Makevars	                        (rev 0)
+++ pkg/RcppArmadillo/src/Makevars	2010-04-03 19:44:16 UTC (rev 960)
@@ -0,0 +1,8 @@
+## -*- mode: makefile; -*-
+
+## Configure tells us about locations for
+## both Rcpp (ie libRcpp.so and Rcpp.h) and 
+## Armadillo headers and library via the variables
+PKG_CXXFLAGS=$(shell Rscript -e "Rcpp:::CxxFlags()"|sed /^WARNING/d) -I. -I../inst/include
+PKG_LIBS=$(shell Rscript -e "Rcpp:::LdFlags()"|sed /^WARNING/d) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+

Deleted: pkg/RcppArmadillo/src/Makevars.in
===================================================================
--- pkg/RcppArmadillo/src/Makevars.in	2010-04-03 19:41:30 UTC (rev 959)
+++ pkg/RcppArmadillo/src/Makevars.in	2010-04-03 19:44:16 UTC (rev 960)
@@ -1,8 +0,0 @@
-## -*- mode: makefile; -*-
-
-## Configure tells us about locations for
-## both Rcpp (ie libRcpp.so and Rcpp.h) and 
-## Armadillo headers and library via the variables
-PKG_CPPFLAGS =		@PKG_CPPFLAGS@ -I. -I../inst/include
-PKG_LIBS =		@PKG_LIBS@
-

Modified: pkg/RcppArmadillo/src/Makevars.win
===================================================================
--- pkg/RcppArmadillo/src/Makevars.win	2010-04-03 19:41:30 UTC (rev 959)
+++ pkg/RcppArmadillo/src/Makevars.win	2010-04-03 19:44:16 UTC (rev 960)
@@ -1,4 +1,4 @@
-## This assume that we can call Rscript to ask Rcpp about its locations
+## This assumes that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
 PKG_LIBS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
 PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()'`