[Rcpp-commits] r714 - in pkg/RcppArmadillo: inst src

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

Author: romain
Date: 2010-02-17 10:40:48 +0100 (Wed, 17 Feb 2010)
New Revision: 714

Added:
   pkg/RcppArmadillo/inst/include/
Modified:
   pkg/RcppArmadillo/src/Makevars
   pkg/RcppArmadillo/src/Makevars.win
Log:
install the headers in inst/include

Modified: pkg/RcppArmadillo/src/Makevars
===================================================================
--- pkg/RcppArmadillo/src/Makevars	2010-02-17 09:32:58 UTC (rev 713)
+++ pkg/RcppArmadillo/src/Makevars	2010-02-17 09:40:48 UTC (rev 714)
@@ -1,6 +1,11 @@
 ## Use the R_HOME indirection to support installations of multiple R version
 PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()" )
 PKG_LIBS = $(shell $(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()" )
 
+INCLUDE_DIR=../inst/include
+
+all: $(SHLIB) install
+
+install:
+	cp -f *.h $(INCLUDE_DIR)
+

Modified: pkg/RcppArmadillo/src/Makevars.win
===================================================================
--- pkg/RcppArmadillo/src/Makevars.win	2010-02-17 09:32:58 UTC (rev 713)
+++ pkg/RcppArmadillo/src/Makevars.win	2010-02-17 09:40:48 UTC (rev 714)
@@ -3,3 +3,10 @@
 ## Use the R_HOME indirection to support installations of multiple R version
 PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()'`
 PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'`
+
+INCLUDE_DIR=../inst/include
+
+all: $(SHLIB) install
+
+install:
+	cp -vax *.h $(INCLUDE_DIR)