[Rinside-commits] r256 - in pkg: . inst src

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

Author: edd
Date: 2012-09-09 19:38:00 +0200 (Sun, 09 Sep 2012)
New Revision: 256

Modified:
   pkg/DESCRIPTION
   pkg/inst/NEWS.Rd
   pkg/src/Makevars.win
Log:
one more set of src/Makevars.win changes


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-09-08 00:54:38 UTC (rev 255)
+++ pkg/DESCRIPTION	2012-09-09 17:38:00 UTC (rev 256)
@@ -1,6 +1,6 @@
 Package: RInside
 Title: C++ classes to embed R in C++ applications
-Version: 0.2.8
+Version: 0.2.8.2
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois
 Maintainer: Dirk Eddelbuettel <edd at debian.org>

Modified: pkg/inst/NEWS.Rd
===================================================================
--- pkg/inst/NEWS.Rd	2012-09-08 00:54:38 UTC (rev 255)
+++ pkg/inst/NEWS.Rd	2012-09-09 17:38:00 UTC (rev 256)
@@ -2,15 +2,20 @@
 \title{News for Package 'RInside'}
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
+\section{Changes in RInside version 0.2.9 (2012-09-12)}{
+  \itemize{
+    \item On more set of of src/Makevars.win changes
+  }
+}
 \section{Changes in RInside version 0.2.8 (2012-09-07)}{
   \itemize{
     \item Added CMake build support for armadillo and eigen examples,
     once again kindly contributed by Peter Aberline
     \item Corrected Windows package build to always generate a 64 bit
     static library too
-    \item Updated package build to no longer require configure{.win} to
+    \item Updated package build to no longer require configure / configure.win to
     update the two header file supplying compile-time information;
-    tightened build dependencies on headers in Makevars
+    tightened build dependencies on headers in Makevars / Makevars.win
     \item Improved examples/standard/Makefile.win by detecting architecture
   }
 }

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2012-09-08 00:54:38 UTC (rev 255)
+++ pkg/src/Makevars.win	2012-09-09 17:38:00 UTC (rev 256)
@@ -17,40 +17,43 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RInside.  If not, see <http://www.gnu.org/licenses/>.
 
-USERLIBST=libRInside.a
-USERLIB=libRInside.dll
-USERDIR=../inst/lib
+USERLIBST =	libRInside.a
+USERLIB =	libRInside.dll
+USERDIR =	$(R_PACKAGE_DIR)/inst/lib$(R_ARCH)
 
-PKG_CPPFLAGS += -I../inst/include/
-PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
+PKG_CPPFLAGS += -I. -I../inst/include/
+PKG_LIBS = 	$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 
-all:	headers $(SHLIB) userLibrary
+RSCRIPT =	${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe
 
-headers: RInsideAutoloads.h RInsideEnvVars.h
+all:		headers $(SHLIB) userLibrary
 
+headers: 	RInsideAutoloads.h RInsideEnvVars.h
+
 RInsideAutoloads.h:
-	${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe tools/RInsideAutoloads.r > RInsideAutoloads.h
+		$(RSCRIPT) tools/RInsideAutoloads.r > RInsideAutoloads.h
 
 RInsideEnvVars.h:
-	${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe tools/RInsideEnvVars.r   > RInsideEnvVars.h
+		$(RSCRIPT) tools/RInsideEnvVars.r   > RInsideEnvVars.h
 
-RInside.cpp: headers
+RInside.cpp: 	headers
 
-userLibrary: $(USERLIBST) $(USERLIB)
-	- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
-	cp $(USERLIB) $(USERDIR)$(R_ARCH)
+userLibrary: 	$(USERLIBST) $(USERLIB)
+		- at if test ! -e $(USERDIR); then mkdir -p $(USERDIR); fi
+		cp $(USERLIB) $(USERDIR)
 
-$(USERLIBST): $(OBJECTS)
-	- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
-	$(AR) qc $(USERLIBST) $^
-	@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
-	cp $(USERLIBST) $(USERDIR)$(R_ARCH)
+$(USERLIBST): 	$(OBJECTS)
+		- at if test ! -e $(USERDIR); then mkdir -p $(USERDIR); fi
+		$(AR) qc $(USERLIBST) $^
+		@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
+		cp $(USERLIBST) $(USERDIR)
+		ls -lR $(USERDIR)
 
-$(USERLIB): $(OBJECTS)
-	$(CXX) -Wl,--export-all-symbols -shared -o $(USERLIB) $^ $(ALL_LIBS) -lws2_32
+$(USERLIB): 	$(OBJECTS)
+		$(CXX) -Wl,--export-all-symbols -shared -o $(USERLIB) $^ $(ALL_LIBS) -lws2_32
 
-.PHONY: all clean userLibrary headers
+.PHONY: 	all clean userLibrary headers
 
 clean:
-	rm -f $(OBJECTS) $(SHLIB) $(USERLIBST) $(USERLIB)
+		rm -f $(OBJECTS) $(SHLIB) $(USERLIBST) $(USERLIB)