Merge branch 'master' of https://github.com/JanThorbecke/OpenSource

Make_include_template

@@ -84,8 +84,13 @@ OPTC += -fopenmp
 #############################################################################
 # BLAS and LAPACK libraries 
 MKLROOT=/opt/intel/mkl/
+MKLLIB=${MKLROOT}/lib
 #for GNU compilers
-BLAS = ${MKLROOT}/lib/libmkl_gf_lp64.a ${MKLROOT}/lib/libmkl_sequential.a ${MKLROOT}/lib/libmkl_core.a -lpthread -lm -ldl
+#you might need to add intel64 to : ${MKLROOT}/lib/intel64
+BLAS = -L${MKLROOT}/lib/ -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl
+#on linux you want to use groups and MKL is in lib/intel64
+#MKLLIB=${MKLROOT}/lib/intel64
+#BLAS = -Wl,-rpath ${MKLLIB} -Wl,--start-group -L${MKLLIB} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -Wl,--end-group -lpthread -lm -ldl
 #for intel compilers
 #BLAS = -mkl
 
@@ -97,17 +102,20 @@ BLAS = ${MKLROOT}/lib/libmkl_gf_lp64.a ${MKLROOT}/lib/libmkl_sequential.a ${MKLR
 #BLAS = -L$(AMDROOT)/lib -lacml -lfortran -lffio -lrt -lm
 #Intel MKL
 MKLROOT=/opt/intel/mkl/
+MKLLIB=${MKLROOT}/lib
 OPTC += -DMKL -I$(MKLROOT)/include
 #for GNU compilers
-BLAS = ${MKLROOT}/lib/libmkl_gf_lp64.a ${MKLROOT}/lib/libmkl_sequential.a ${MKLROOT}/lib/libmkl_core.a -lpthread -lm -ldl
-#for intel compilers
-#FFT = ${MKLROOT}/lib/libmkl_intel_lp64.a ${MKLROOT}/lib/libmkl_sequential.a ${MKLROOT}/lib/libmkl_core.a -lpthread -lm -ldl
+FFT = -Wl,-rpath ${MKLLIB} -L${MKLLIB} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl
+#on linux you want to use groups and MKL is in lib/intel64
+#MKLLIB=${MKLROOT}/lib/intel64
+#FFT = -Wl,-rpath ${MKLLIB} -Wl,--start-group -L${MKLLIB} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -Wl,--end-group -lpthread -lm -ldl
+#for Intel compilers
+#FFT = -Wl,-rpath ${MKLLIB} -Wl,--start-group -L${MKLLIB} -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -Wl,--end-group -lpthread -lm -ldl
 
 #LIBARIES
 LIBS= -L$L -lgenfft $(FFT) $(BLAS)
 
 
-
 ########################################################################
 # standard CFLAGS
 CFLAGS = -I$I -I.