update Makefile

.gitignore

@@ -67,4 +67,5 @@ deps
 *.Rcheck
 *.rds
 *.Rproj
-.Rproj.user
+.Rproj.user
+R-package/inst/*

Makefile

@@ -158,6 +158,15 @@ rcppexport:
 roxygen:
 	Rscript -e "require(roxygen2); roxygen2::roxygenise(\"R-package\")"
 
+rpkg:	roxygen
+	mkdir -p R-package/inst
+	mkdir -p R-package/inst/libs
+	cp -rf lib/libmxnet.so R-package/inst/libs
+	mkdir -p R-package/inst/include
+	cp -rf include/* R-package/inst/include
+	cp -rf dmlc-core/include/* R-package/inst/include/
+	R CMD build R-package
+
 clean:
 	$(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~
 

R-package/.Rbuildignore

@@ -1,5 +1,5 @@
 \.o$
-\.so$
+src/*.so$
 \.dll$
 ^.*\.Rproj$
 ^\.Rproj\.user$

R-package/src/Makevars

@@ -1,19 +1,6 @@
-# _*_ mode: makefile; _*_
-PKGROOT=../../
-
 # This file is only used for compilation from github
 # It will be replaced by more formal Rpackage structure
 # Where PKGROOT moved to root directory
 
-.PHONY: all mxlib
-all: $(SHLIB)
-
-$(SHLIB): mxlib
-mxlib:
-	cd $(PKGROOT); make CXX="$(CXX)"; cd -
-	mkdir -p ../inst
-	mkdir -p ../inst/libs
-	cp $(PKGROOT)/lib/libmxnet.so ../inst/libs/libmxnet.so
-
-PKG_CPPFLAGS = -I$(PKGROOT)/include -I$(PKGROOT)/dmlc-core/include
-PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS) #$(FLIBS)
+PKG_CPPFLAGS = -I../inst/include
+PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS)