Merged changes from svn dev version.

This commit is contained in:
Salvatore Filippone
2017-10-02 12:04:14 +01:00
parent 13d6f8c8a7
commit bbba6a670e
47 changed files with 814 additions and 138 deletions
+2 -1
View File
@@ -3,12 +3,13 @@
#
INSTALLDIR=../..
INCDIR=$(INSTALLDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
LIBDIR=$(INSTALLDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
DTOBJS=d_file_spmv.o