Permalink
Browse files

Fix GNUisms

  • Loading branch information...
1 parent 08cd89b commit 636c48d0bc38035964a2d26b1ce80b60e7de77ff @asl committed May 25, 2011
Showing with 9 additions and 11 deletions.
  1. +2 −2 DESCRIPTION
  2. +7 −9 src/Makevars
View
4 DESCRIPTION
@@ -1,8 +1,8 @@
Package: svd
Type: Package
Title: Interfaces to various state-of-art SVD and eigensolvers
-Version: 0.1
-Date: 2011-03-13
+Version: 0.2
+Date: 2011-05-26
Author: Anton Korobeynikov
Maintainer: Anton Korobeynikov <asl@math.spbu.ru>
Description: This package provides various R bindings to various SVD and eigensolvers (PROPACK, nuTRLan)
View
16 src/Makevars
@@ -1,20 +1,18 @@
PKG_LIBS=$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-PKG_FFLAGS+=-W -Wall -pedantic -I../inst/include
-PKG_CFLAGS+=-W -Wall -pedantic -I../inst/include
+PKG_CFLAGS=-I../inst/include
.PHONY: all clean shlib-clean
-PROPACK_OBJS=dlansvd_irl.o printstat.o second.o propack_svd.o
-PROPACK_DIR=propack
+PROPACK_OBJS=propack/dlansvd_irl.o propack/printstat.o propack/second.o \
+ propack/propack_svd.o
-TRLAN_OBJS=dsort2.o dstqrb.o trlcore.o trlaux.o trlan.o trl_comm_none.o trlmap.o restart.o trlan_R.o
-TRLAN_DIR=trlan
+TRLAN_OBJS=trlan/dsort2.o trlan/dstqrb.o trlan/trlcore.o trlan/trlaux.o \
+ trlan/trlan.o trlan/trl_comm_none.o trlan/trlmap.o \
+ trlan/restart.o trlan/trlan_R.o
SVD_OBJS=extmat.o
-OBJECTS=$(SVD_OBJS) \
- $(addprefix $(PROPACK_DIR)/,$(PROPACK_OBJS)) \
- $(addprefix $(TRLAN_DIR)/,$(TRLAN_OBJS))
+OBJECTS=$(SVD_OBJS) $(PROPACK_OBJS) $(TRLAN_OBJS)
all: $(SHLIB)

0 comments on commit 636c48d

Please sign in to comment.