[Rinside-commits] r164 - pkg/src

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

Author: romain
Date: 2010-06-15 18:10:40 +0200 (Tue, 15 Jun 2010)
New Revision: 164

Modified:
   pkg/src/Makevars.win
Log:
take 2

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-06-15 15:58:10 UTC (rev 163)
+++ pkg/src/Makevars.win	2010-06-15 16:10:40 UTC (rev 164)
@@ -15,7 +15,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RInside.  If not, see <http://www.gnu.org/licenses/>.
 
-USERLIB=libRInside$(DYLIB_EXT)
 USERLIBST=libRInside.a
 USERDIR=../inst/lib
 
@@ -24,18 +23,18 @@
 
 all:	$(SHLIB) userLibrary
 
-userLibrary: $(USERLIB) $(USERLIBST)
+userLibrary: $(USERLIBST)
 	- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
-	cp $(USERLIB) $(USERDIR)$(R_ARCH)
+	cp $(SHLIB) $(USERDIR)$(R_ARCH)/libRInside.dll
 	cp $(USERLIBST) $(USERDIR)$(R_ARCH)
-	rm $(USERLIB) $(USERLIBST)
+	rm $(USERLIBST)
 
-$(USERLIB): $(OBJECTS)
-
 $(USERLIBST): $(OBJECTS)
-	
+	$(AR) qc $(USERLIBST) $^
+	@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
+			
 .PHONY: all clean userLibrary
 
 clean:
-	rm -f $(OBJECTS) $(SHLIB) $(USERLIB) $(USERLIBST)
+	rm -f $(OBJECTS) $(SHLIB) $(USERLIBST)