[Rcpp-commits] r1117 - pkg/Rcpp/src

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

Author: romain
Date: 2010-04-25 22:23:55 +0200 (Sun, 25 Apr 2010)
New Revision: 1117

Modified:
   pkg/Rcpp/src/Makevars
Log:
less intrusive fix

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2010-04-25 20:19:54 UTC (rev 1116)
+++ pkg/Rcpp/src/Makevars	2010-04-25 20:23:55 UTC (rev 1117)
@@ -17,7 +17,11 @@
 CLINK_CPPFLAGS = $(shell Rscript "cxx0x/cxx0x.R")
 endif
 
+ifeq ($(DYLIB_EXT),)
+all:
+else
 all: 	$(SHLIB) userLibrary 
+endif
 
 ## we place it inside the inst/ directory so that it gets installed by the package
 USERDIR =	../inst/lib
@@ -28,24 +32,18 @@
 PKG_CPPFLAGS += -I../inst/include/
 
 userLibrary: 	$(USERLIB) $(USERLIBST)
-ifneq ($(DYLIB_EXT),)
-			- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
-			cp $(USERLIB) $(USERDIR)$(R_ARCH)
-			cp $(USERLIBST) $(USERDIR)$(R_ARCH)
-			rm $(USERLIB) $(USERLIBST)
-endif
+		- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
+		cp $(USERLIB) $(USERDIR)$(R_ARCH)
+		cp $(USERLIBST) $(USERDIR)$(R_ARCH)
+		rm $(USERLIB) $(USERLIBST)
 
 $(USERLIB): 	$(OBJECTS)
-ifneq ($(DYLIB_EXT),)
-			$(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
-endif
+		$(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): 	$(OBJECTS)
-ifneq ($(DYLIB_EXT),)
-			$(AR) qc $(USERLIBST) $^
-			@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
-endif
+		$(AR) qc $(USERLIBST) $^
+		@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
 		
 .PHONY: 	all clean userLibrary