Merge branch 'devel' into adam

[unres.git] / source / cluster / wham / src / Makefile

diff --git a/source/cluster/wham/src/Makefile b/source/cluster/wham/src/Makefile
index 333ebec..b192a7b 100644 (file)
--- a/source/cluster/wham/src/Makefile
+++ b/source/cluster/wham/src/Makefile
@@ -3,9 +3,15 @@ BIN=../../../../bin
 FC = ifort
 OPT = -O3 -ip -w
 OPT = -CB -g 
+<<<<<<< HEAD
+FFLAGS =  ${OPT} -c -I. -Iinclude_unres -I$(INSTALL_DIR)/include
+CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
+LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a -g -d2 -CA -CB
+=======
 FFLAGS =  ${OPT} -c -I. -I./include_unres -I../src_MD_T-sccor -I/users/adam/MEY_MD/src_Tc-czarek -I$(INSTALL_DIR)/include
 CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
 LIBS = -L$(INSTALL_DIR)/lib -lmpich ./xdrf/libxdrf.a -g -d2 -CA -CB
+>>>>>>> devel
 
 .c.o:
        cc -c -DLINUX -DPGI $*.c