From: Adam Liwo <adam@piasek4.chem.univ.gda.pl>
Date: Sun, 10 May 2015 02:44:22 +0000 (+0200)
Subject: Import fixed makefiles in cluster
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c338d1ba9e4887d9c4e6ae15a468702d65f2c20f;hp=-c;p=unres.git

Import fixed makefiles in cluster
Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1

Conflicts:
	source/cluster/wham/src-M/Makefile-MPICH-gfortran
	source/cluster/wham/src-M/Makefile-MPICH-ifort
---

c338d1ba9e4887d9c4e6ae15a468702d65f2c20f
diff --combined source/cluster/wham/src-M/Makefile-MPICH-ifort
index 1c9a07a,1530c5d..71024b3
--- a/source/cluster/wham/src-M/Makefile-MPICH-ifort
+++ b/source/cluster/wham/src-M/Makefile-MPICH-ifort
@@@ -15,7 -15,7 +15,7 @@@ LIBS = -L$(INSTALL_DIR)/lib -lmpich xdr
  .F.o:
  	${FC} ${FFLAGS} ${CPPFLAGS} ${FFLAGS} $*.F
  
- objects = main_clust.o arcos.o cartprint.o chainbuild.o convert.o initialize_p.o \
+ object = 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 \
@@@ -29,30 -29,30 +29,30 @@@ no_option
  
  GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
  	-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
- GAB: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_GAB.exe
- GAB: ${objects} xdrf/libxdrf.a
+ GAB: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_GAB.exe
+ GAB: ${object} xdrf/libxdrf.a
  	cc -o compinfo compinfo.c
  	./compinfo | true
  	${FC} ${FFLAGS} cinfo.f
 -	$(FC) ${OPT} ${object} ${LIBS} -o ${BIN}
 +	$(FC) ${OPT} ${objects} ${LIBS} -o ${BIN}
  
  4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
  	-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
- 4P: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_4P.exe
- 4P: ${objects} xdrf/libxdrf.a
+ 4P: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_4P.exe
+ 4P: ${object} xdrf/libxdrf.a
  	cc -o compinfo compinfo.c
  	./compinfo | true
  	${FC} ${FFLAGS} cinfo.f
 -	$(FC) ${OPT} ${object} ${LIBS} -o ${BIN}
 +	$(FC) ${OPT} ${objects} ${LIBS} -o ${BIN}
  
  E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
  	-DCLUST -DSPLITELE -DLANG0 
- E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe
- E0LL2Y: ${objects} xdrf/libxdrf.a
+ E0LL2Y: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_E0LL2Y.exe
+ E0LL2Y: ${object} xdrf/libxdrf.a
  	cc -o compinfo compinfo.c
  	./compinfo | true
  	${FC} ${FFLAGS} cinfo.f
 -	$(FC) ${OPT} ${object} ${LIBS} -o ${BIN}
 +	$(FC) ${OPT} ${objects} ${LIBS} -o ${BIN}
  
  xdrf/libxdrf.a:
  	cd xdrf && make