[Rinside-commits] r135 - in pkg/inst/examples: mpi standard

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

Author: edd
Date: 2010-03-22 16:10:57 +0100 (Mon, 22 Mar 2010)
New Revision: 135

Modified:
   pkg/inst/examples/mpi/Makefile
   pkg/inst/examples/standard/Makefile
Log:
 o remove non-portable linker argument (to strip executables) and run /usr/bin/strip (where available) instead
 o added 'run' target for mpi as well (with a test for mpirun)


Modified: pkg/inst/examples/mpi/Makefile
===================================================================
--- pkg/inst/examples/mpi/Makefile	2010-03-22 14:38:53 UTC (rev 134)
+++ pkg/inst/examples/mpi/Makefile	2010-03-22 15:10:57 UTC (rev 135)
@@ -39,11 +39,14 @@
 CXX := 			$(shell $(R_HOME)/bin/R CMD config CXX)
 CPPFLAGS := 		-Wall $(shell $(R_HOME)/bin/R CMD config CPPFLAGS)
 CXXFLAGS := 		$(MPICPPFLAGS) $(RCPPFLAGS) $(RCPPINCL) $(RINSIDEINCL) $(shell $(R_HOME)/bin/R CMD config CXXFLAGS)
-LDFLAGS	= 		-s
 LDLIBS := 		$(MPILIBS) $(RLDFLAGS) $(RBLAS) $(RLAPACK) $(RCPPLIBS) $(RINSIDELIBS)
 
 all : 			$(programs)
+			@test -x /usr/bin/strip && strip $^
 
+run :			$(programs)
+			@test -x /usr/bin/mpirun && for p in $(programs); do echo; echo "Running $$p:"; mpirun -n 4 ./$$p; done
+
 clean:
 			rm -vf $(programs)
 

Modified: pkg/inst/examples/standard/Makefile
===================================================================
--- pkg/inst/examples/standard/Makefile	2010-03-22 14:38:53 UTC (rev 134)
+++ pkg/inst/examples/standard/Makefile	2010-03-22 15:10:57 UTC (rev 135)
@@ -35,10 +35,10 @@
 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)
-LDFLAGS	= 		-s
 LDLIBS := 		$(RLDFLAGS) $(RBLAS) $(RLAPACK) $(RCPPLIBS) $(RINSIDELIBS)
 
 all : 			$(programs)
+			@test -x /usr/bin/strip && strip $^
 
 run :			$(programs)
 			@for p in $(programs); do echo; echo "Running $$p:"; ./$$p; done