Merge branch 'adasko' into devel

[unres.git] / source / unres / src_MD / Makefile

diff --git a/source/unres/src_MD/Makefile b/source/unres/src_MD/Makefile
index ec1bcf3..e144e8b 100644 (file)
--- a/source/unres/src_MD/Makefile
+++ b/source/unres/src_MD/Makefile
@@ -8,10 +8,10 @@ OPT =  -g -ip -w -CB
 FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include 
 FFLAGS1 = -c -w -g -d2 -CA -CB -I$(INSTALL_DIR)/include 
 FFLAGS2 = -c -w -g -O0 -I$(INSTALL_DIR)/include  
-FFLAGSE = -c -w -O3 -ipo -ipo_obj  -opt_report -I$(INSTALL_DIR)/include
+FFLAGSE = -c -w -O3 -CB -ipo -ipo_obj  -opt_report -I$(INSTALL_DIR)/include
 
 
-LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a
+LIBS = -L$(INSTALL_DIR)/lib -lmpich ../../lib/xdrf/libxdrf.a
 
 ARCH = LINUX
 PP = /lib/cpp -P
@@ -41,8 +41,9 @@ object = unres.o arcos.o cartprint.o chainbuild.o convert.o initialize_p.o \
         q_measure.o gnmr1.o test.o
 
 GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DUNRES -DISNAN -DMP -DMPI \
-       -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-GAB: BIN = ../../../bin/unres/MD/unres_ifort_MPICH_GAB.exe
+       -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC\
+        -DSCCORPDB
+GAB: BIN = ../../../bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
 GAB: ${object} xdrf/libxdrf.a
        cc -o compinfo compinfo.c
        ./compinfo | true
@@ -59,7 +60,7 @@ E0LL2Y: ${object} xdrf/libxdrf.a
        ${FC} ${OPT} ${object} cinfo.o ${LIBS}  -o ${BIN}
 
 xdrf/libxdrf.a:
-       cd xdrf && make
+       cd ../../lib/xdrf && make
 
 
 clean: