projects
/
unres4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
etor & etor_d multichain match prerelease
[unres4.git]
/
source
/
wham
/
Makefile
diff --git
a/source/wham/Makefile
b/source/wham/Makefile
index
a04735a
..
b2024c4
100644
(file)
--- a/
source/wham/Makefile
+++ b/
source/wham/Makefile
@@
-20,8
+20,8
@@
FFLAGS2 = -fpp -c -g -CA -CB #-O0
#EXE_FILE = ../bin/wham_F90_EL.exe
#UNRES_FILE= ../../UNRESS/unres_f90/source/unres_MD-M
#EXE_FILE = ../bin/wham_F90_EL.exe
#UNRES_FILE= ../../UNRESS/unres_f90/source/unres_MD-M
-UNRES_FILE= ../unres_MD-M
-UNRES_DATA_FILE= ../unres_MD-M/data
+UNRES_FILE= ../unres
+UNRES_DATA_FILE= ../unres/data
data = wham_data.o w_compar_data.o w_comm_local.o
data = wham_data.o w_compar_data.o w_comm_local.o
@@
-142,8
+142,8
@@
io_base.o: ${UNRES_FILE}/io_base.f90
energy.o: ${UNRES_FILE}/energy.f90
${FC} ${FFLAGSE} ${CPPFLAGS} ${UNRES_FILE}/energy.f90
energy.o: ${UNRES_FILE}/energy.f90
${FC} ${FFLAGSE} ${CPPFLAGS} ${UNRES_FILE}/energy.f90
-control.o: ${UNRES_FILE}/control.f90
- ${FC} ${FFLAGS} ${CPPFLAGS} ${UNRES_FILE}/control.f90
+control.o: ${UNRES_FILE}/control.F90
+ ${FC} ${FFLAGS} ${CPPFLAGS} ${UNRES_FILE}/control.F90
io_config.o: ${UNRES_FILE}/io_config.f90
${FC} ${FFLAGS2} ${CPPFLAGS} ${UNRES_FILE}/io_config.f90
io_config.o: ${UNRES_FILE}/io_config.f90
${FC} ${FFLAGS2} ${CPPFLAGS} ${UNRES_FILE}/io_config.f90
@@
-151,8
+151,8
@@
io_config.o: ${UNRES_FILE}/io_config.f90
regularize.o: ${UNRES_FILE}/regularize.f90
${FC} ${FFLAGS} ${CPPFLAGS} ${UNRES_FILE}/regularize.f90
regularize.o: ${UNRES_FILE}/regularize.f90
${FC} ${FFLAGS} ${CPPFLAGS} ${UNRES_FILE}/regularize.f90
-compare.o: ${UNRES_FILE}/compare.f90
- ${FC} ${FFLAGS} ${CPPFLAGS} ${UNRES_FILE}/compare.f90
+compare.o: ${UNRES_FILE}/compare.F90
+ ${FC} ${FFLAGS} ${CPPFLAGS} ${UNRES_FILE}/compare.F90
proc_proc.o: proc_proc.c
proc_proc.o: proc_proc.c