[Rcpp-commits] r728 - in pkg/Rcpp: . inst src

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

Author: edd
Date: 2010-02-17 17:58:52 +0100 (Wed, 17 Feb 2010)
New Revision: 728

Modified:
   pkg/Rcpp/NEWS
   pkg/Rcpp/inst/ChangeLog
   pkg/Rcpp/src/Makevars
   pkg/Rcpp/src/Makevars.win
Log:
Makevars and Makevars.win no longer need to filter RcppExample out


Modified: pkg/Rcpp/NEWS
===================================================================
--- pkg/Rcpp/NEWS	2010-02-17 16:10:48 UTC (rev 727)
+++ pkg/Rcpp/NEWS	2010-02-17 16:58:52 UTC (rev 728)
@@ -7,8 +7,11 @@
     	input is a matrix. The classes don't/can't however guarantee 
     	that the enclosed SEXP will allways be a matrix
 
-    o	RcppExample et al have been moved to a new package RcppExamples
+    o	RcppExample et al have been moved to a new package RcppExamples;
+        src/Makevars and src/Makevars.win simplified accordingly
 
+    o	Improved src/Makevars.win thanks to Brian Ripley
+
     o	New examples for 'fast lm' using compiled code: 
         - using GNU GSL and a C interface
         - using Armadillo (http://arma.sf.net) and a C++ interface

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-02-17 16:10:48 UTC (rev 727)
+++ pkg/Rcpp/inst/ChangeLog	2010-02-17 16:58:52 UTC (rev 728)
@@ -1,28 +1,35 @@
+2010-02-17  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/Makevars: Simplified as RcppExample.cpp is shipped off
+	* src/Makevars.win: Simplified as RcppExample.cpp is shipped off
+
 2010-02-17  Romain Francois <romain at r-enthusiasts.com>
 
-	* src/Rcpp/SEXP_Vector.h : The lhs use of operator[](string) has 
-	been improved so that if the name does not exist in the vector, 
+	* src/Rcpp/SEXP_Vector.h : The lhs use of operator[](string) has
+	been improved so that if the name does not exist in the vector,
 	the vector grows.
-	
+
 	* inst/unitTests/runit.GenericVector.R: new unit test
 	test.List.implicit.push.back about the new operator[](string)
 
 	* src/Rcpp/SimpleVector.h : new template class SimpleMatrix<int>
 	that derives from SimpleVector<int>, with typedefs NumericMatrix
-	IntegerMatrix, LogicalMatrix, RawMatrix, ComplexMatrix. The actual 
-	functionality comes from SimpleVector but SimpleMatrix has 
+	IntegerMatrix, LogicalMatrix, RawMatrix, ComplexMatrix. The actual
+	functionality comes from SimpleVector but SimpleMatrix has
 	constructors and assignment operators that behave slighlty
 	differently : they check that their input is a matrix
 
 	* src/Rcpp/traits/wrap_type_traits: added support for float
 
-	* src/Rcpp/Rcpp.h: now including RObject here instead of in 
+	* src/Rcpp/Rcpp.h: now including RObject here instead of in
 	RcppCommon.h because RObject is a client of implicit converters
 	(attr) and so we need to leave a hook for third party code, e.g.
 	RcppArmadillo
 
 2010-02-16  Dirk Eddelbuettel  <edd at debian.org>
 
+	* src/Makevars.wim: Applied improved version kindly supplied by Brian Ripley
+
 	* R/RcppExample.R, man/RcppExample.Rd: Moved to RcppExamples package
 	* man/RcppDate.Rd, man/RcppParams.Rd, man/RcppResultSet.Rd, RcppVector.Rd,
 	  src/RcppExample.cpp: Idem

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2010-02-17 16:10:48 UTC (rev 727)
+++ pkg/Rcpp/src/Makevars	2010-02-17 16:58:52 UTC (rev 728)
@@ -23,10 +23,6 @@
 SOURCES =	$(wildcard *.cpp)
 OBJECTS =	$(SOURCES:.cpp=.o)
 
-## the 'user' library contains all source apart from RcppExample.o and is what
-## users need for their projects -- RcppExample is used by the package library
-USEROBJ	=	$(filter-out RcppExample.o,$(OBJECTS))
-
 ## we place it inside the inst/ directory so that it gets installed by the package
 USERDIR =	../inst/lib
 
@@ -48,11 +44,11 @@
 		cp $(USERLIBST) $(USERDIR)$(R_ARCH)
 		rm $(USERLIB) $(USERLIBST)
 
-$(USERLIB): 	$(USEROBJ)
+$(USERLIB): 	$(OBJECTS)
 		$(SHLIB_CXXLD) -o $(USERLIB) $^ $(SHLIB_CXXLDFLAGS) $(ALL_LIBS)
 		@if test -e "/usr/bin/install_name_tool"; then /usr/bin/install_name_tool -id $(R_PACKAGE_DIR)/lib$(R_ARCH)/$(USERLIB) $(USERLIB); fi
 
-$(USERLIBST): 	$(USEROBJ)
+$(USERLIBST): 	$(OBJECTS)
 		$(AR) qc $(USERLIBST) $^
 		@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
 

Modified: pkg/Rcpp/src/Makevars.win
===================================================================
--- pkg/Rcpp/src/Makevars.win	2010-02-17 16:10:48 UTC (rev 727)
+++ pkg/Rcpp/src/Makevars.win	2010-02-17 16:58:52 UTC (rev 728)
@@ -16,10 +16,7 @@
 SOURCES =	$(wildcard *.cpp)
 OBJECTS =	$(SOURCES:.cpp=.o)
 
-## the 'user' library contains all source apart from RcppExample.o and is what
-## users need for their projects -- RcppExample is used by the package library
 ## we place it inside the inst/ directory so that it gets installed by the package
-USEROBJ	=	$(filter-out RcppExample.o,$(OBJECTS))
 USERDIR	= 	../inst/lib$(R_ARCH)
 USERLIB	= 	$(USERDIR)/libRcpp.a
 
@@ -50,7 +47,7 @@
 		cp -vax Rcpp/internal/*.h $(USERDIR)/Rcpp/internal
 		cp -vax Rcpp/traits/*.h $(USERDIR)/Rcpp/traits
 
-$(USERLIB):	$(USEROBJ)
+$(USERLIB):	$(OBJECTS)