Merge remote-tracking branch 'upstream/master'

Conflicts:
	test/serial/Makefile
This commit is contained in:
Soren Rasmussen
2017-10-30 10:35:06 +00:00
+4 -4
View File
@@ -1,11 +1,11 @@
#
# Libraries used
#
BASEDIR=../..
INCDIR=$(BASEDIR)/include/
MODDIR=$(BASEDIR)/modules/
INSTALLDIR=../..
INCDIR=$(INSTALLDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
LIBDIR=$(BASEDIR)/lib/
LIBDIR=$(INSTALLDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)