Permalink
Browse files

Allow USE_SYSTEM_FFTW

  • Loading branch information...
ViralBShah committed Mar 10, 2012
1 parent fd92973 commit 0d2b254be191106b6e87348a28592e97ce046791
Showing with 11 additions and 3 deletions.
  1. +6 −2 Make.inc
  2. +5 −1 external/Makefile
View
@@ -43,18 +43,19 @@ DEBUGFLAGS = -g -DDEBUG
SHIPFLAGS = -O3 -DNDEBUG
endif
-# OS specific stuff
-
# If OpenBLAS doesn't build, find your architechure at the following URL and enter it below
# https://github.com/xianyi/OpenBLAS/blob/master/GotoBLAS_01Readme.txt
TARGET_OPENBLAS_ARCH=
+# Use libraries available on the system instead of building them
+
USE_SYSTEM_LIBUNWIND=0
USE_SYSTEM_LLVM=0
USE_SYSTEM_READLINE=0
USE_SYSTEM_PCRE=0
USE_SYSTEM_BLAS=0
USE_SYSTEM_LAPACK=0
+USE_SYSTEM_FFTW=0
ifeq ($(USE_DEBIAN), 1)
USE_SYSTEM_LIBUNWIND=1
@@ -63,6 +64,7 @@ USE_SYSTEM_READLINE=1
USE_SYSTEM_PCRE=1
USE_SYSTEM_BLAS=1
USE_SYSTEM_LAPACK=1
+USE_SYSTEM_FFTW=1
endif
#ifeq ($(OS), Darwin)
@@ -114,6 +116,8 @@ else
LIBLAPACK = $(JULIAHOME)/external/lapack-$(LAPACK_VER)/liblapack.a
endif
+# OS specific stuff
+
ifeq ($(OS), Linux)
SHLIB_EXT = so
LDFLAGS = -Xlinker -rpath $(JULIAHOME)/lib
View
@@ -22,7 +22,7 @@ include $(JULIAHOME)/Make.inc
OS = $(shell uname)
ARCH = $(shell uname -m)
-LIBS = fdlibm dsfmt arpack fftw suitesparse suitesparse-wrapper double-conversion amos gmp gmp-wrapper
+LIBS = fdlibm dsfmt arpack suitesparse suitesparse-wrapper double-conversion amos gmp gmp-wrapper
ifeq ($(OS), Linux)
LIBS += unwind
@@ -52,6 +52,10 @@ ifeq ($(USE_SYSTEM_LAPACK), 0)
LIBS += lapack
endif
+ifeq ($(USE_SYSTEM_FFTW), 0)
+LIBS += fftw
+endif
+
# Hard-coded setup for libraries on Debian
ifeq ($(USE_DEBIAN), 1)
LIBS = fdlibm dsfmt double-conversion amos suitesparse-wrapper gmp-wrapper

0 comments on commit 0d2b254

Please sign in to comment.