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

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

Author: romain
Date: 2010-12-12 13:46:20 +0100 (Sun, 12 Dec 2010)
New Revision: 2781

Added:
   pkg/RcppArmadillo/R/SHLIB.R
Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/DESCRIPTION
Log:
also RcppArmadillo:::SHLIB

Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2010-12-12 12:41:03 UTC (rev 2780)
+++ pkg/RcppArmadillo/ChangeLog	2010-12-12 12:46:20 UTC (rev 2781)
@@ -1,3 +1,8 @@
+2010-12-12  Romain Francois <romain at r-enthusiasts.com>
+
+    * R/SHLIB.R: new unexported R function SHLIB, small wrapper around 
+    R CMD SHLIB
+
 2010-11-25  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.2.10

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2010-12-12 12:41:03 UTC (rev 2780)
+++ pkg/RcppArmadillo/DESCRIPTION	2010-12-12 12:46:20 UTC (rev 2781)
@@ -1,7 +1,7 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.2.10
+Version: 0.2.10.1
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel and Doug Bates
 Maintainer: Romain Francois, Dirk Eddelbuettel and Doug Bates <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.12.0), Rcpp (>= 0.8.8)
+Depends: R (>= 2.12.0), Rcpp (>= 0.8.9.4)
 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

Added: pkg/RcppArmadillo/R/SHLIB.R
===================================================================
--- pkg/RcppArmadillo/R/SHLIB.R	                        (rev 0)
+++ pkg/RcppArmadillo/R/SHLIB.R	2010-12-12 12:46:20 UTC (rev 2781)
@@ -0,0 +1,23 @@
+## 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/>.
+
+SHLIB <- Rcpp:::SHLIB.maker( 
+    env = list( 
+        PKG_LIBS = sprintf( "%s $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", Rcpp:::RcppLdFlags() ),
+        PKG_CPPFLAGS = sprintf( "%s %s", Rcpp:::RcppCxxFlags(), RcppArmadillo:::RcppArmadilloCxxFlags() )
+   )
+)