[Rinside-commits] r177 - in pkg: . inst inst/examples/standard src

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

Author: edd
Date: 2010-08-06 13:59:32 +0200 (Fri, 06 Aug 2010)
New Revision: 177

Modified:
   pkg/DESCRIPTION
   pkg/inst/ChangeLog
   pkg/inst/examples/standard/Makefile
   pkg/src/Makevars
   pkg/src/Makevars.win
Log:
src/Makevars* get emacs mode header
DESCRIPTION rolled to indicate release candidate
harmless commented out hint of rpath for R itself in examples/standard/Makefile


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-07-09 20:59:14 UTC (rev 176)
+++ pkg/DESCRIPTION	2010-08-06 11:59:32 UTC (rev 177)
@@ -1,6 +1,6 @@
 Package: RInside
 Title: C++ classes to embed R in C++ applications
-Version: 0.2.2
+Version: 0.2.2.99
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois
 Maintainer: Dirk Eddelbuettel and Romain Francois <RomainAndDirk at r-enthusiasts.com>

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-07-09 20:59:14 UTC (rev 176)
+++ pkg/inst/ChangeLog	2010-08-06 11:59:32 UTC (rev 177)
@@ -1,3 +1,10 @@
+2010-08-06  Dirk Eddelbuettel  <edd at debian.org>
+
+	* Release 0.2.3
+
+	* src/Makevars: Set emacs header for Makefile mode
+	* src/Makevars.win: Set emacs header for Makefile mode
+	
 2010-07-09  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/include/RInside.h: New argument to constructor to select

Modified: pkg/inst/examples/standard/Makefile
===================================================================
--- pkg/inst/examples/standard/Makefile	2010-07-09 20:59:14 UTC (rev 176)
+++ pkg/inst/examples/standard/Makefile	2010-08-06 11:59:32 UTC (rev 177)
@@ -20,6 +20,8 @@
 RBLAS := 		$(shell $(R_HOME)/bin/R CMD config BLAS_LIBS)
 RLAPACK := 		$(shell $(R_HOME)/bin/R CMD config LAPACK_LIBS)
 
+## if you need to set an rpath to R itself, also uncomment
+#RRPATH :=		-Wl,-rpath,$(R_HOME)/lib
 
 ## include headers and libraries for Rcpp interface classes
 RCPPINCL := 		$(shell echo 'Rcpp:::CxxFlags()' | $(R_HOME)/bin/R --vanilla --slave)
@@ -30,17 +32,16 @@
 RINSIDEINCL := 		$(shell echo 'RInside:::CxxFlags()' | $(R_HOME)/bin/R --vanilla --slave)
 RINSIDELIBS := 		$(shell echo 'RInside:::LdFlags()'  | $(R_HOME)/bin/R --vanilla --slave)
 
-
 ## compiler etc settings used in default make rules
 CXX := 			$(shell $(R_HOME)/bin/R CMD config CXX)
 CPPFLAGS := 		-Wall $(shell $(R_HOME)/bin/R CMD config CPPFLAGS)
 CXXFLAGS := 		$(RCPPFLAGS) $(RCPPINCL) $(RINSIDEINCL) $(shell $(R_HOME)/bin/R CMD config CXXFLAGS)
-LDLIBS := 		$(RLDFLAGS) $(RBLAS) $(RLAPACK) $(RCPPLIBS) $(RINSIDELIBS)
+LDLIBS := 		$(RLDFLAGS) $(RRPATH) $(RBLAS) $(RLAPACK) $(RCPPLIBS) $(RINSIDELIBS)
 
-all : 			$(programs)
+all: 			$(programs)
 			@test -x /usr/bin/strip && strip $^
 
-run :			$(programs)
+run:			$(programs)
 			@for p in $(programs); do echo; echo "Running $$p:"; ./$$p; done
 
 clean:

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2010-07-09 20:59:14 UTC (rev 176)
+++ pkg/src/Makevars	2010-08-06 11:59:32 UTC (rev 177)
@@ -1,3 +1,5 @@
+## -*- mode: Makefile; tab-width: 8 -*- 
+##
 ## Copyright (C) 2010 Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RInside.

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-07-09 20:59:14 UTC (rev 176)
+++ pkg/src/Makevars.win	2010-08-06 11:59:32 UTC (rev 177)
@@ -1,3 +1,5 @@
+## -*- mode: Makefile; tab-width: 8 -*- 
+##
 ## Copyright (C) 2010 Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RInside.
@@ -36,7 +38,7 @@
 
 $(USERLIB): $(OBJECTS)
 	$(CXX) -Wl,--export-all-symbols -shared -o $(USERLIB) $^ $(ALL_LIBS) -lws2_32
-	
+
 .PHONY: all clean userLibrary
 
 clean: