[Rcpp-commits] r993 - in pkg/RcppArmadillo: . R

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

Author: romain
Date: 2010-04-05 20:34:55 +0200 (Mon, 05 Apr 2010)
New Revision: 993

Removed:
   pkg/RcppArmadillo/R/flags.R
Modified:
   pkg/RcppArmadillo/README
Log:
remove the CxxFlags and LdFlags functions

Deleted: pkg/RcppArmadillo/R/flags.R
===================================================================
--- pkg/RcppArmadillo/R/flags.R	2010-04-05 17:03:27 UTC (rev 992)
+++ pkg/RcppArmadillo/R/flags.R	2010-04-05 18:34:55 UTC (rev 993)
@@ -1,42 +0,0 @@
-## Copyright (C)       2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
-##
-## This file is part of RcppArmadillo.
-##
-## RcppArmadillo is free software: you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 2 of the License, or
-## (at your option) any later version.
-##
-## RcppArmadillo is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
-
-RcppArmadilloCxxFlags <- function(Rcpp = TRUE, ...){
-    rcpp <- ifelse(Rcpp, Rcpp:::RcppCxxFlags(...), "")
-
-    arma <- system.file("include", package = "RcppArmadillo")
-    if (.Platform$OS.type=="windows")
-        arma <- paste('"', arma, '"', sep="")
-    
-    res <- sprintf('%s -I%s -I/usr/include ', rcpp, arma)
-}
-
-CxxFlags <- function(Rcpp = TRUE, ...){
-    cat( RcppArmadilloCxxFlags(Rcpp = Rcpp, ...), sep = " " )
-}
-
-
-RcppArmadilloLdFlags <- function(Rcpp = TRUE, ...){
-    rcpp <- ifelse( Rcpp, Rcpp:::RcppLdFlags(static= !grepl("^linux",R.version$os) ) , "" )
-    arma <- c("-L/usr/lib -larmadillo" )
-    paste( rcpp, arma, "", sep = " " )
-}
-
-LdFlags <- function(Rcpp = TRUE, ...){
-    cat( RcppArmadilloLdFlags(Rcpp, ... ), sep = "" )
-}
-## no ldflags as user packages would not need to link to RcppArmadillo.so

Modified: pkg/RcppArmadillo/README
===================================================================
--- pkg/RcppArmadillo/README	2010-04-05 17:03:27 UTC (rev 992)
+++ pkg/RcppArmadillo/README	2010-04-05 18:34:55 UTC (rev 993)
@@ -10,8 +10,8 @@
 
 - contains a src/Mavevars (and src/Makevars.win) with: 
 
-PKG_CXXFLAGS=$(shell Rscript -e "Rcpp:::CxxFlags()"|sed /^WARNING/d)
-PKG_LIBS=$(shell Rscript -e "Rcpp:::LdFlags()"|sed /^WARNING/d) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_CXXFLAGS=$(shell Rscript -e "Rcpp:::CxxFlags()" )
+PKG_LIBS=$(shell Rscript -e "Rcpp:::LdFlags()" ) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 - include the RcppArmadillo header :