[Rcpp-commits] r2456 - in pkg/RcppExamples: . inst src

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

Author: romain
Date: 2010-11-19 08:26:53 +0100 (Fri, 19 Nov 2010)
New Revision: 2456

Modified:
   pkg/RcppExamples/DESCRIPTION
   pkg/RcppExamples/inst/ChangeLog
   pkg/RcppExamples/src/Makevars
Log:
remove SystemRequirements: gnu make

Modified: pkg/RcppExamples/DESCRIPTION
===================================================================
--- pkg/RcppExamples/DESCRIPTION	2010-11-19 07:21:06 UTC (rev 2455)
+++ pkg/RcppExamples/DESCRIPTION	2010-11-19 07:26:53 UTC (rev 2456)
@@ -1,6 +1,6 @@
 Package: RcppExamples
 Title: Examples using Rcpp to interface R and C++ 
-Version: 0.1.1.1
+Version: 0.1.1.2
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, based on code written 
  during 2005 and 2006 by Dominick Samperi 
@@ -12,9 +12,8 @@
  Note that the documentation in this package currently does not all the
  features in the package.
 Depends: R (>= 2.11.0), Rcpp (>= 0.8.4)
-LinkingTo: 
+LinkingTo: Rcpp
 Suggests: RUnit 
-SystemRequirements: GNU make
 LinkingTo: Rcpp
 URL: http://dirk.eddelbuettel.com/code/rcpp.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/Rcpp
 License: GPL (>= 2)

Modified: pkg/RcppExamples/inst/ChangeLog
===================================================================
--- pkg/RcppExamples/inst/ChangeLog	2010-11-19 07:21:06 UTC (rev 2455)
+++ pkg/RcppExamples/inst/ChangeLog	2010-11-19 07:26:53 UTC (rev 2456)
@@ -1,3 +1,9 @@
+2010-11-19  Romain Francois <romain at r-enthusiasts.com>
+
+    * src/Makevars: apply new recommended PKG_LIBS declaration
+    
+    * DESCRIPTION: removed SystemRequirements: GNU make
+
 2010-07-29  Romain Francois <romain at r-enthusiasts.com>
 
 	* src/RcppMatrixExample.cpp: disambiguate versions of sqrt

Modified: pkg/RcppExamples/src/Makevars
===================================================================
--- pkg/RcppExamples/src/Makevars	2010-11-19 07:21:06 UTC (rev 2455)
+++ pkg/RcppExamples/src/Makevars	2010-11-19 07:26:53 UTC (rev 2456)
@@ -1,32 +1,5 @@
 ## Emacs please make this a -*- mode: Makefile; -*-
 ##
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" `
 
-## Uncomment this if you want to use C++0x features -- which are not currently portable
-## CLINK_CPPFLAGS=$(shell Rscript -e "Rcpp:::Cxx0xFlags()" )
-
-## As an alternative, one can also add this code in a file 'configure'
-##
-##    PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
-## 
-##    sed -e "s|@PKG_LIBS@|${PKG_LIBS}|" \
-##        src/Makevars.in > src/Makevars
-## 
-## which together with the following file 'src/Makevars.in'
-##
-##    PKG_LIBS = @PKG_LIBS@
-##
-## can be used to create src/Makevars dynamically. This scheme is more
-## powerful and can be expanded to also check for and link with other
-## libraries.  It should be complemented by a file 'cleanup'
-##
-##    rm src/Makevars
-##
-## which removes the autogenerated file src/Makevars. 
-##
-## Of course, autoconf can also be used to write configure files. This is
-## done by a number of packages, but recommended only for more advanced users
-## comfortable with autoconf and its related tools.
-
-