From 05d13dc9059636d9c4c8976bc469b6d1fc65d81a Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sat, 29 Sep 2018 09:34:54 +0000
Subject: RELEASE NOTES for 0.98

---
 Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 17bad5f..25616c7 100644
--- a/Makefile
+++ b/Makefile
@@ -162,25 +162,25 @@ ifdef SHOW_COMPILER_WARNINGS
   CPPFLAGS += -Wall
 endif
 
-ifndef FORCE_STATIC
-  LIBS = -lgsl -lz
-  ifdef WITH_OPENBLAS
-    LIBS += -lopenblas
-  else
-    LIBS += -L$(GUIX_ENVIRONMENT) -latlas -lcblas -llapack -lblas
-  endif
-  ifdef WITH_GSLCBLAS
-    LIBS += -lgslcblas
-  else
-    LIBS += -lgfortran -lquadmath
-  endif
-else
-  LIBS = -L$(GUIX)/lib -lopenblas -lgsl -lz -lgslcblas -lgfortran -lquadmath
+ifdef FORCE_STATIC
+  LIBS = -L$(GUIX)/lib -lgfortran -lquadmath
   ifndef TRAVIS_CI # Travis static compile we cheat a little
     CPPFLAGS += -static
   endif
 endif
 
+LIBS += -lgsl -lz
+ifdef WITH_OPENBLAS
+  LIBS += -lopenblas
+else
+  LIBS += -latlas -lcblas -llapack -lblas
+endif
+ifdef WITH_GSLCBLAS
+  LIBS += -lgslcblas
+endif
+ifdef FORCE_STATIC
+  LIBS += -lgfortran -lquadmath
+endif
 
 .PHONY: all
 
-- 
cgit 1.4.1