Adapted makefile to compile with MaM shared library

BiCGStab_Iker/makefile

@@ -21,11 +21,16 @@
 # ============================================================
 # GNU COMPILERS
 # ============================================================
+DIR = /home/martini/mam_bicgstab
+APP = malleability/build
+MAMFLAGS = -I$(DIR)/malleability -L$(DIR)/$(APP) -lmam
+#-Wl,-rpath=$(DIR)/$(APP) 
 
-CC = mpicxx
+CC = mpicc
 CFLAGS = -std=c++11 -mavx -fabi-version=0 -Wall -fopenmp -I. -I${MKLROOT}/include -I${HOME}/libs
-CFLAGS = -std=c++11 -Wall -fopenmp -I. -I${MKLROOT}/include -I${HOME}/libs
+#CFLAGS = -std=c++11 -Wall -fopenmp -I. -I${MKLROOT}/include -I${HOME}/libs
 CLFLAGS = -Wall -fopenmp -I. -I${MKLROOT}/include
+CFLAGS = -Wall -fopenmp -I. -I${HOME}/libs #ADDED BY IKER
 
 CLINKER = mpicxx
 LDFLAGS = -fopenmp
@@ -35,6 +40,7 @@ LIBLIST = -L. -lhbio -lclock -lm -lc
 LIBLIST = -L. -lsparse -lvector -lclock -lm -lc
 
 LIBMKL = -L${MKLROOT}/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
+LIBMKL = 
 
 # ============================================================
 
@@ -71,14 +77,14 @@ libsparse.a : $(OBJS_SPARSE)
 	$(AR) $(ARFLAGS) $@ $?
 	$(RL) $(RLFLAGS) $@
 
-BiCGStab: BiCGStab.o ToolsMPI.o matrix.o 
-	$(CLINKER) $(LDFLAGS) -o BiCGStab BiCGStab.o ToolsMPI.o matrix.o $(LIBMKL) $(LIBLIST)
+BiCGStab: BiCGStab.o ToolsMPI.o ToolsMAM.o matrix.o mymkl.o
+	$(CLINKER) $(LDFLAGS) -o BiCGStab BiCGStab.o ToolsMPI.o ToolsMAM.o matrix.o mymkl.o $(LIBMKL) $(LIBLIST) $(MAMFLAGS) 
 
 # ============================================================
 
 .c.o:
 	echo compiling
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) -c $*.c 
 
 clean:
 	rm -f *.o *.a BiCGStab