ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Makefile.in
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Makefile.in (file contents):
Revision 884 by mmeineke, Thu Dec 18 21:47:51 2003 UTC vs.
Revision 999 by chrisfen, Fri Jan 30 15:01:09 2004 UTC

# Line 49 | Line 49 | MODDIRFLAG=@MODDIRFLAG@
49   # MODDIRFLAG
50   MODDIRFLAG=@MODDIRFLAG@
51  
52 # MPI F90 Module path
53 MPI_F90_MODS=@MPI_F90_MODS@
54
52   # Compiler dependent Fortran module
53   FLIBS_EXTRA = @F90LIBS@
54  
# Line 127 | Line 124 | MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS
124   # include paths starting with "." are all relative to the SUBDIRS!!!
125  
126   INCLUDES= -I.. -I../../libBASS $(SPRNG_INC)
127 < MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS)
127 > MPI_INCLUDES= -I$(MPI_INC)
128   F90_INCLUDES= -I/usr/local/include
129  
130   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP)
# Line 181 | Line 178 | CXX_FILES = \
178          $(DIR)/InitializeFromFile.cpp \
179          $(DIR)/LJFF.cpp \
180          $(DIR)/EAM_FF.cpp \
181 +        $(DIR)/WATER.cpp \
182          $(DIR)/SimInfo.cpp \
183          $(DIR)/SimSetup.cpp \
184          $(DIR)/StatWriter.cpp \
# Line 193 | Line 191 | CXX_FILES = \
191          $(DIR)/randomSPRNG.cpp \
192          $(DIR)/fortranWrappers.cpp \
193          $(DIR)/ForceFields.cpp \
196        $(DIR)/mpiSimulation.cpp \
194          $(DIR)/Molecule.cpp \
195          $(DIR)/NPTf.cpp \
196          $(DIR)/NPTi.cpp \
# Line 202 | Line 199 | CXX_FILES = \
199          $(DIR)/SimState.cpp \
200          $(DIR)/ZConstraint.cpp \
201          $(DIR)/ZConsWriter.cpp \
202 <        $(DIR)/Profile.cpp \
203 <        $(DIR)/GenericData.cpp
202 >        $(DIR)/mdProfile.cpp \
203 >        $(DIR)/GenericData.cpp \
204 >        $(DIR)/mpiSimulation.cpp
205  
206   F90_FILES= \
207          $(DIR)/definitions_module.F90 \
208          $(DIR)/status_module.F90 \
209          $(DIR)/atype_module.F90 \
210          $(DIR)/calc_dipole_dipole.F90 \
211 +        $(DIR)/calc_charge_charge.F90 \
212          $(DIR)/calc_reaction_field.F90 \
213          $(DIR)/calc_LJ_FF.F90 \
214          $(DIR)/calc_eam.F90 \
# Line 223 | Line 222 | F90_FILES= \
222          $(DIR)/force_globals.F90 \
223          $(DIR)/mpiSimulation_module.F90 \
224          $(DIR)/notifyCutoffs.F90 \
225 +        $(DIR)/timing.F90 \
226          $(DIR)/oopseMPI_module.F90
227  
228   DIR:=.
# Line 357 | Line 357 | obj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
357          obj/force_globals$(O)
358  
359   obj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
360 +        obj/definitions_module$(O) \
361 +        obj/atype_module$(O) \
362 +        obj/simulation_module$(O) \
363 +        obj/force_globals$(O) \
364 +        obj/vector_class$(O)
365 +
366 + obj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
367          obj/definitions_module$(O) \
368          obj/atype_module$(O) \
369          obj/simulation_module$(O) \
# Line 394 | Line 401 | obj/wrappers$(O): ./wrappers.F90 \
401          obj/do_Forces$(O) \
402          obj/notifyCutoffs$(O)
403  
404 + obj/timing$(O): ./timing.F90 \
405 +        obj/do_Forces$(O)
406  
407  
408  
400
401
409   #MPI dependencies:
410  
411   MPIobj/definitions_module$(O): ./definitions_module.F90
# Line 480 | Line 487 | MPIobj/do_Forces$(O): ./do_Forces.F90 \
487          MPIobj/force_globals$(O) \
488          MPIobj/vector_class$(O)
489  
490 + MPIobj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
491 +        MPIobj/definitions_module$(O) \
492 +        MPIobj/atype_module$(O) \
493 +        MPIobj/simulation_module$(O) \
494 +        MPIobj/mpiSimulation_module$(O) \
495 +        MPIobj/force_globals$(O) \
496 +        MPIobj/vector_class$(O)
497 +
498   MPIobj/do_Forces$(O): ./do_Forces.F90 \
499          MPIobj/definitions_module$(O) \
500          MPIobj/mpiSimulation_module$(O) \
# Line 513 | Line 528 | MPIobj/wrappers$(O): ./wrappers.F90 \
528          MPIobj/do_Forces$(O) \
529          MPIobj/notifyCutoffs$(O)  
530  
531 + MPIobj/timing$(O): ./timing.F90 \
532 +        MPIobj/do_Forces$(O) \
533 +        MPIobj/mpiSimulation_module$(O)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines