[Phylobase-commits] r817 - in pkg: . src

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

Author: bbolker
Date: 2010-11-20 04:27:35 +0100 (Sat, 20 Nov 2010)
New Revision: 817

Modified:
   pkg/DESCRIPTION
   pkg/src/Makevars
   pkg/src/Makevars.win
Log:
  updates for Rcpp build changes/directions



Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-10-27 18:05:40 UTC (rev 816)
+++ pkg/DESCRIPTION	2010-11-20 03:27:35 UTC (rev 817)
@@ -1,10 +1,11 @@
 Package: phylobase
 Type: Package
 Title: Base package for phylogenetic structures and comparative data
-Version: 0.6.1
+Version: 0.6.2
 Date: 2010-08-06
 Depends: methods, grid, ape(>= 2.1), Rcpp (>= 0.8.3)
-Suggests: adephylo, MASS
+LinkingTo: Rcpp
+Suggests: adephylo, MASS, RUnit
 Author: R Hackathon et al. (alphabetically: Ben Bolker, Marguerite Butler, Peter Cowan,  Damien de Vienne, Dirk Eddelbuettel, Mark Holder, Thibaut Jombart, Steve Kembel, Francois Michonneau, David Orme, Brian O'Meara, Emmanuel Paradis, Jim Regetz, Derrick Zwickl)
 Maintainer:  Ben Bolker <bolker at mcmaster.ca>
 Description: Provides a base S4 class for comparative methods, incorporating one or more trees and trait data

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2010-10-27 18:05:40 UTC (rev 816)
+++ pkg/src/Makevars	2010-11-20 03:27:35 UTC (rev 817)
@@ -1,5 +1,5 @@
 RCPP_FLAGS=`${R_HOME}/bin/Rscript -e "Rcpp:::CxxFlags()"`
 RCPP_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
-#
+
 PKG_CPPFLAGS=-I. ${RCPP_FLAGS} -DHAVE_INTTYPES_H
-PKG_LIBS=${RCPP_LIBS}
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-10-27 18:05:40 UTC (rev 816)
+++ pkg/src/Makevars.win	2010-11-20 03:27:35 UTC (rev 817)
@@ -1,4 +1,7 @@
-PKG_LIBS = -s $(shell Rscript -e 'Rcpp:::LdFlags()') -L"$(RHOME)/bin" -lR --no-export-all-symbols --add-stdcall-alias
+## PKG_LIBS = -s $(shell Rscript -e 'Rcpp:::LdFlags()') -L"$(RHOME)/bin" -lR --no-export-all-symbols --add-stdcall-alias
 PKG_CXXFLAGS = $(shell Rscript -e 'Rcpp:::CxxFlags()') -I. -DHAVE_INTTYPES_H
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e 
+"Rcpp:::LdFlags()")
 
 
+