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

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

Author: romain
Date: 2010-08-13 11:30:04 +0200 (Fri, 13 Aug 2010)
New Revision: 1997

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/ChangeLog
   pkg/Rcpp/src/Makevars
Log:
Rcpp no longer requires GNU make

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-08-13 09:26:47 UTC (rev 1996)
+++ pkg/Rcpp/DESCRIPTION	2010-08-13 09:30:04 UTC (rev 1997)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.8.5.6
+Version: 0.8.5.7
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek, David Reiss and Douglas Bates; based on code written during 
@@ -35,7 +35,6 @@
  provide additional usage examples.
 Depends: R (>= 2.10.0), methods
 Suggests: RUnit, inline
-SystemRequirements: GNU make
 URL: http://dirk.eddelbuettel.com/code/rcpp.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/Rcpp
 License: GPL (>= 2)
 BugReports: http://r-forge.r-project.org/tracker/?atid=637&group_id=155&func=browse

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-08-13 09:26:47 UTC (rev 1996)
+++ pkg/Rcpp/inst/ChangeLog	2010-08-13 09:30:04 UTC (rev 1997)
@@ -8,6 +8,11 @@
 	
 	* inst/unitTests/runit.sugar.R: added regression test for complex functions
 	which did not handle NA properly before
+	
+	* DESCRIPTION: no longer requireing GNU make as we dont use it anymore
+	
+	* src/Makevars: removed the use of ifeq (which was the last thing requiring
+	GNU make)
 
 2010-08-12  Romain Francois <romain at r-enthusiasts.com>
 

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2010-08-13 09:26:47 UTC (rev 1996)
+++ pkg/Rcpp/src/Makevars	2010-08-13 09:30:04 UTC (rev 1997)
@@ -13,12 +13,7 @@
 ## uncomment this to enable c++0x features (experimental)
 ## CLINK_CPPFLAGS=-std=c++0x
 
-## guarding against a bug in how 'R CMD check' checks for portable flags
-ifeq ($(SHLIB),)
-all:
-else
 all: 	$(SHLIB) userLibrary 
-endif
 
 ## we place it inside the inst/ directory so that it gets installed by the package
 USERDIR =	../inst/lib