[Earthmovdist-commits] r25 - in pkg: . src

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

Author: edd
Date: 2010-10-14 18:28:00 +0200 (Thu, 14 Oct 2010)
New Revision: 25

Modified:
   pkg/DESCRIPTION
   pkg/src/Makevars
   pkg/src/Makevars.win
Log:
switch to LinkingTo: Rcpp as R can tell us where to find header file (see the Rcpp-package vignette in Rcpp for details)


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-01-15 03:16:34 UTC (rev 24)
+++ pkg/DESCRIPTION	2010-10-14 16:28:00 UTC (rev 25)
@@ -1,5 +1,5 @@
 Package: earthmovdist
-Version: 0.1.0
+Version: 0.1.1
 Date: 2009-04-24
 Author: Rainer M Krug <Rainer at krugs.de> and Dirk Eddelbuettel <edd at debian.org> 
 Maintainer: Rainer M Krug <Rainer at krugs.de>
@@ -10,7 +10,7 @@
  Machine Intelligence (PAMI), 29(5):840-853, 2007. It is based on code from
  http://www.ist.temple.edu/~hbling/code/EmdL1_v3.zip
 Depends: Rcpp (>= 0.6.4)
-SystemRequirements: Rcpp
+LinkingTo: Rcpp
 License: GPL-2 for R package; research-only license for Emd-L1; see README.txt
 URL: http://earthmovdist.r-forge.r-project.org/
 Packaged: Mon Apr 20 09:40:16 2009; rkrug

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2010-01-15 03:16:34 UTC (rev 24)
+++ pkg/src/Makevars	2010-10-14 16:28:00 UTC (rev 25)
@@ -1,3 +1,3 @@
 # We need to know where libRcpp.so and Rcpp.h reside
-PKG_CPPFLAGS = $(shell Rscript -e 'Rcpp:::CxxFlags()')
-PKG_LIBS = $(shell Rscript -e 'Rcpp:::LdFlags()')
+# PKG_CPPFLAGS = $(shell Rscript -e 'Rcpp:::CxxFlags()')
+PKG_LIBS = $(shell Rscript -e 'Rcpp:::LdFlags(static=TRUE)')

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-01-15 03:16:34 UTC (rev 24)
+++ pkg/src/Makevars.win	2010-10-14 16:28:00 UTC (rev 25)
@@ -1,3 +1,3 @@
 # We need to know where libRcpp.so and Rcpp.h reside
-PKG_CPPFLAGS = $(shell Rscript.exe -e "Rcpp:::CxxFlags()")
+# PKG_CPPFLAGS = $(shell Rscript.exe -e "Rcpp:::CxxFlags()")
 PKG_LIBS = $(shell Rscript.exe -e "Rcpp:::LdFlags()")