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

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

Author: edd
Date: 2011-01-04 16:28:32 +0100 (Tue, 04 Jan 2011)
New Revision: 2827

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/NEWS
   pkg/Rcpp/inst/THANKS
   pkg/Rcpp/src/Makevars
Log:
replace the GNU make variable $^ with a more portable explicit list of depends
updated NEWS according, and thank Rainer for the hint


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2011-01-03 18:49:13 UTC (rev 2826)
+++ pkg/Rcpp/ChangeLog	2011-01-04 15:28:32 UTC (rev 2827)
@@ -1,3 +1,7 @@
+2011-01-04  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/Makevars: Replace implicit variable $^ with explicit list
+
 2011-01-02  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/doc/Rcpp-quickref/Rcpp-quickref.Rnw: Applied patch with

Modified: pkg/Rcpp/inst/NEWS
===================================================================
--- pkg/Rcpp/inst/NEWS	2011-01-03 18:49:13 UTC (rev 2826)
+++ pkg/Rcpp/inst/NEWS	2011-01-04 15:28:32 UTC (rev 2827)
@@ -1,3 +1,8 @@
+0.9.1   2011-..-..
+
+    o   Removed another GNU Make-specific variable from src/Makevars in order
+        to make the build more portable; this was noticed on FreeBSD
+
 0.9.0   2010-12-19
 
     o   The classic API was factored out into its own package RcppClassic which

Modified: pkg/Rcpp/inst/THANKS
===================================================================
--- pkg/Rcpp/inst/THANKS	2011-01-03 18:49:13 UTC (rev 2826)
+++ pkg/Rcpp/inst/THANKS	2011-01-04 15:28:32 UTC (rev 2827)
@@ -4,13 +4,14 @@
 Laurent Gautier         for helpful discussions on R internals
 Alistair Gee            for a patch making ColDatum more robust
 Christian Gunning       for a documentation + unit tests patches and reporting bugs
+Rainer Hurling          for help debugging builds issues on FreeBSD
 Uwe Ligges              for help with Windows (32 and 64 bit) build issues
 Tama Ma                 for a patch that extends Module constructors
 Karl Millar             for a patch helping with a non-g++ compiler
 Martyn Plummer          for help with Solaris build issues
 David Reiss             for the first-ever contributed patch (Rcpp*View)
 Brian Ripley            for help with Win64 + Solaris build issues
-Dominick Samperi        for starting what we now call the Classic Rcpp
+Dominick Samperi        for starting what is now in the RcppClassic package
 Oleg Sklyar             for the incredibly cool inline package
 Luke Tierney            for helpful discussions on R internals
 Simon Urbanek           for help on OS X build issues and with R internals

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2011-01-03 18:49:13 UTC (rev 2826)
+++ pkg/Rcpp/src/Makevars	2011-01-04 15:28:32 UTC (rev 2827)
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2008 - 2009 Dirk Eddelbuettel <edd at debian.org>
 # Copyright (C) 2008        Simon Urbanek <simon.urbanek at r-project.org>
-# Copyright (C) 2009 - 2010 Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2009 - 2011 Dirk Eddelbuettel and Romain Francois
 
 ## $(SHLIB) is the usual default target that is built automatically from all source 
 ## files in this directory. userLibrary is an additional target for the second library
@@ -30,13 +30,13 @@
 		rm $(USERLIB) $(USERLIBST)
 
 $(USERLIB): 	$(OBJECTS)
-		$(SHLIB_CXXLD) -o $(USERLIB) $^ $(SHLIB_CXXLDFLAGS) $(ALL_LIBS)
+		$(SHLIB_CXXLD) -o $(USERLIB) $(OBJECTS) $(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): 	$(OBJECTS)
 		$(AR) qc $(USERLIBST) $^
 		@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
-		
+
 .PHONY: 	all clean userLibrary 
 
 clean: