[Phylobase-commits] r818 - pkg/src

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

Author: edd
Date: 2010-11-23 16:56:13 +0100 (Tue, 23 Nov 2010)
New Revision: 818

Modified:
   pkg/src/Makevars
   pkg/src/Makevars.win
Log:
simplified as 'LinkingTo: Rcpp' in DESCRIPTION already gives us headers


Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2010-11-20 03:27:35 UTC (rev 817)
+++ pkg/src/Makevars	2010-11-23 15:56:13 UTC (rev 818)
@@ -1,5 +1,2 @@
-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_CPPFLAGS=-I. -DHAVE_INTTYPES_H
 PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-11-20 03:27:35 UTC (rev 817)
+++ pkg/src/Makevars.win	2010-11-23 15:56:13 UTC (rev 818)
@@ -1,7 +1,6 @@
 ## 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()")
+PKG_CXXFLAGS =  -I. -DHAVE_INTTYPES_H
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")