Merge branch 'prerelease-3.2.1' into czarek

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

diff --git a/source/cluster/wham/src/Makefile b/source/cluster/wham/src/Makefile
deleted file mode 100644 (file)
index b192a7b05231c6d4f58ae35ce366ca775d5bef58..0000000000000000000000000000000000000000
--- a/source/cluster/wham/src/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-INSTALL_DIR = /users/software/mpich-1.2.7p1_intel-10.1_em64_ssh
-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
-
-.f.o:
-       ${FC} ${FFLAGS} $*.f
-
-.F.o:
-       ${FC} ${FFLAGS} ${CPPFLAGS} ${FFLAGS} $*.F
-
-objects = main_clust.o arcos.o cartprint.o chainbuild.o convert.o initialize_p.o \
-       matmult.o readrtns.o pinorm.o rescode.o intcor.o timing.o misc.o \
-       geomout.o readpdb.o read_coords.o parmread.o probabl.o fitsq.o hc.o  \
-       track.o wrtclust.o srtclust.o noyes.o contact.o printmat.o \
-       int_from_cart1.o energy_p_new.o icant.o proc_proc.o work_partition.o \
-       setup_var.o read_ref_str.o gnmr1.o
-
-unres_clust: $(objects)
-       $(FC) ${OPT} ${objects} ${LIBS} -o ${BIN}/unres_clustMD_MPI-oldparm
-
-clean:
-       /bin/rm *.o
-
-move:
-       mv *.o ${OBJ}

diff --git a/source/cluster/wham/src/Makefile b/source/cluster/wham/src/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..a35a3e3601bbfc385b2a9568df59473aa574f6fb
--- /dev/null
+++ b/source/cluster/wham/src/Makefile
@@ -0,0 +1 @@
+Makefile-MPICH-gfortran
\ No newline at end of file