Merge pull request #37 from jonathan-taylor/master

Using C-software git submodule

Author: jonathan-taylor

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "C-software"]
+	path = C-software
+	url = https://github.com/selective-inference/C-software.git

.travis.yml

@@ -12,5 +12,10 @@ warnings_are_errors: true
 before_install:
   - tlmgr install index # for texlive and vignette?
   - R -e 'install.packages(c("Rcpp", "intervals"), repos="http://cloud.r-project.org")'
+  - cd C-software
+  - git submodule init
+  - git submodule update
+  - cd ..
+  - make src
   - make Rcpp
   - cd selectiveInference

C-software

@@ -3,12 +3,15 @@ Rcpp:
 	- rm -f selectiveInference/R/RcppExports.R
 	Rscript -e "library(Rcpp); Rcpp::compileAttributes('selectiveInference')"
 
-install: Rcpp
+install: Rcpp src
 	R CMD INSTALL selectiveInference
 
-build: 
+build: src 
 	R CMD build selectiveInference
 
-check: Rcpp build
+src:
+	cp C-software/src/* selectiveInference/src
+
+check: Rcpp build 
 	R CMD build selectiveInference
 	R CMD check selectiveInference_1.2.2.tar.gz # fix this to be a script variable