From fe16882ec7a9f596757e8c7a2c616faf82af843a Mon Sep 17 00:00:00 2001
From: ahoffmann <antoine.hoffmann@epfl.ch>
Date: Sun, 2 Apr 2023 15:23:16 +0200
Subject: [PATCH] simplified library linkage
---
local/dirs.inc | 6 ++----
local/make.inc | 8 +-------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/local/dirs.inc b/local/dirs.inc
index 35e8b56a..cb368860 100644
--- a/local/dirs.inc
+++ b/local/dirs.inc
@@ -8,9 +8,7 @@ MODDIR = $(PREFIX)/mod
HDF5_LIB = /usr/local/hdf5-1.8.22/lib
FMDIR = $(HOME)/lib/FM
-FFTW3DIR = $(HOME)/lib/fftw-3.3.8
+FFTW3DIR = $(HOME)/lib/fftw-3.3.10
#FFTW3DIR = $(FFTW_HOME)#for Marconi
FUTILS_DIR = $(HOME)/lib/futils/src
-LAPACKDIR = $(HOME)/lib/lapack-3.10.0
-BLASDIR = $(HOME)/lib/BLAS-3.11.0
-# Naming ideas : HeLaZ, MoNoLiT (Moment Non Linear Torroidal)
+LAPACKDIR = $(HOME)/lib/lapack-3.11.0
diff --git a/local/make.inc b/local/make.inc
index f0466e3b..890dcc78 100644
--- a/local/make.inc
+++ b/local/make.inc
@@ -79,16 +79,10 @@ endif
# Add lapack local lib
ifdef LAPACKDIR
- LIBS += -llapack
+ LIBS += -llapack -lblas
LDIRS += -L$(LAPACKDIR)
endif
-# Add blas local lib
-ifdef BLASDIR
- LIBS += -lblas
- LDIRS += -L$(BLASDIR)
-endif
-
# FM library
ifdef FMDIR
LDIRS += -L$(FMDIR)/lib
--
GitLab