[Rcpp-commits] r2618 - in pkg/RcppGSL: R inst/skeleton

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

Author: romain
Date: 2010-11-30 15:16:07 +0100 (Tue, 30 Nov 2010)
New Revision: 2618

Added:
   pkg/RcppGSL/inst/skeleton/Makevars.in
   pkg/RcppGSL/inst/skeleton/configure
Modified:
   pkg/RcppGSL/R/inline.R
Log:
added configure and Makevars.in

Modified: pkg/RcppGSL/R/inline.R
===================================================================
--- pkg/RcppGSL/R/inline.R	2010-11-30 13:58:55 UTC (rev 2617)
+++ pkg/RcppGSL/R/inline.R	2010-11-30 14:16:07 UTC (rev 2618)
@@ -84,10 +84,12 @@
     plugin <- Rcpp:::Rcpp.plugin.maker(
         include.before = "#include <RcppGSL.h>",
         libs = sprintf( "%s $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", LdFlags(FALSE) ),
-        package = "RcppGSL"
+        package = "RcppGSL", Makevars = NULL
     )
     settings <- plugin()
     settings$env$PKG_CPPFLAGS <- CFlags(FALSE)
+    settings$configure <- readLines( system.file( "skeleton", "configure", package = "RcppGSL" ) )
+    settings$Makevars.in <- readLines( system.file( "skeleton", "Makevars.in", package = "RcppGSL" ) )
     settings
 }
 

Added: pkg/RcppGSL/inst/skeleton/Makevars.in
===================================================================
--- pkg/RcppGSL/inst/skeleton/Makevars.in	                        (rev 0)
+++ pkg/RcppGSL/inst/skeleton/Makevars.in	2010-11-30 14:16:07 UTC (rev 2618)
@@ -0,0 +1,9 @@
+
+GSL_CFLAGS = @GSL_CFLAGS@
+GSL_LIBS   = @GSL_LIBS@
+RCPP_LDFLAGS = @RCPP_LDFLAGS@
+
+# combine with standard arguments for R
+PKG_CPPFLAGS = -W $(GSL_CFLAGS) -I../inst/include
+PKG_LIBS += $(GSL_LIBS) $(RCPP_LDFLAGS)
+

Added: pkg/RcppGSL/inst/skeleton/configure
===================================================================
--- pkg/RcppGSL/inst/skeleton/configure	                        (rev 0)
+++ pkg/RcppGSL/inst/skeleton/configure	2010-11-30 14:16:07 UTC (rev 2618)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+GSL_CFLAGS=`${R_HOME}/bin/Rscript -e "RcppGSL:::CFlags()"`
+GSL_LIBS=`${R_HOME}/bin/Rscript -e "RcppGSL:::LdFlags()"`
+RCPP_LDFLAGS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
+
+sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" src/Makevars.in |
+    sed -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" |
+    sed -e "s|@RCPP_LDFLAGS@|${RCPP_LDFLAGS}|" > src/Makevars
+


Property changes on: pkg/RcppGSL/inst/skeleton/configure
___________________________________________________________________
Added: svn:executable
   + *