[Rcpp-commits] r2606 - pkg/RcppGSL/R

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

Author: edd
Date: 2010-11-29 23:57:52 +0100 (Mon, 29 Nov 2010)
New Revision: 2606

Modified:
   pkg/RcppGSL/R/inline.R.in
Log:
minor cleanup


Modified: pkg/RcppGSL/R/inline.R.in
===================================================================
--- pkg/RcppGSL/R/inline.R.in	2010-11-29 22:56:44 UTC (rev 2605)
+++ pkg/RcppGSL/R/inline.R.in	2010-11-29 22:57:52 UTC (rev 2606)
@@ -15,21 +15,14 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
 
-## inlineCxxPlugin <- Rcpp:::Rcpp.plugin.maker(
-## 	include.before = "#include <RcppGSL.h>",
-## 	#LinkingTo     = unique( c( package, "Rcpp", "RcppGSL" ) ),
-## 	#Depends       = unique( c( package, "Rcpp", "RcppGSL" ) ),
-## 	libs           = "@GSL_LIBS@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)",
-## 	package        = "RcppGSL"
-## )
-
 inlineCxxPlugin <- local({
     settings <- Rcpp:::Rcpp.plugin.maker(include.before = "#include <RcppGSL.h>",
+                                         libs = "@GSL_LIBS@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)",
+                                         package = "RcppGSL",
                                          ##LinkingTo = unique( c( package, "Rcpp", "RcppGSL" ) ),
                                          ##Depends = unique( c( package, "Rcpp", "RcppGSL" ) ),
-                                         libs = "@GSL_LIBS@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)",
-                                         package = "RcppGSL", 
-                                         Makevars = "", Makevars.win = "" 
+                                         Makevars = "",
+                                         Makevars.win = ""
                                          )()
     settings$env$PKG_CPPFLAGS <- "@GSL_CFLAGS@"
     function(...) settings