_really_ fix makefiles and defines for various options

src/cluster/cluster.cpp

@@ -43,9 +43,9 @@
 #include "../include/algebraic.h"
 #endif
 
-#ifdef LAPACK_ILP64
-#define USE_LAPACK
-#endif
+//#ifdef LAPACK_ILP64
+//#define USE_LAPACK
+//#endif
 
 using namespace std;
 

src/make.inc

@@ -73,11 +73,12 @@ endif
 
 # CXXFLAGS defines the default compilation options for the C++ compiler
 ifndef CXXFLAGS
-ifdef USE_LAPACK
-override CXXFLAGS=-O3 -ggdb -pg -coverage -I$(HDF5_INCLUDE) -I$(LAPACK_INCLUDE)
-else
 override CXXFLAGS=-O3 -ggdb -pg -coverage -I$(HDF5_INCLUDE)
-#override CXXFLAGS=-O3 -I$(HDF5_INCLUDE)
+ifdef USE_LAPACK
+override CXXFLAGS+= -DUSE_LAPACK -DMKL_ILP64 -DLAPACK_ILP64 
+ifdef USE_MKL
+override CXXFLAGS+= -DMKL_ILP64 -I$(MKLROOT)/include
+endif
 endif
 endif
 
@@ -87,9 +88,11 @@ ifndef CXXLDFLAGS
 ifndef HDF5_LIB
 override HDF5_LIB=/usr/lib/x86_64-linux-gnu/hdf5/serial
 endif
-override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(LAPACK_LDFLAGS) $(LDFLAGS)
-#else
-#override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(CXXLDFLAGS)
+override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5
+ifdef USE_LAPACK
+override CXXLDFLAGS+= $(LAPACK_LDFLAGS)
+endif
+override CXXLDFLAGS+= $(LDFLAGS)
 endif
 
 #SOFLAGS defines the additional flags for the c++ compiler to create a shared object file