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

Comparing trunk/OOPSE/libmdtools/Makefile (file contents):
Revision 386 by gezelter, Fri Mar 21 20:52:11 2003 UTC vs.
Revision 460 by chuckv, Fri Apr 4 22:22:30 2003 UTC

# Line 18 | Line 18 | MPI_INCLUDES= -I$(MPICH_INC) -I$(MPICH_INC)/mpi2c++ -I
18   # include paths starting with "." are all relative to the SUBDIRS!!!
19  
20   INCLUDES= -I.. -I../../libBASS -I$(SPRNG_INC)
21 < MPI_INCLUDES= -I$(MPICH_INC) -I$(MPICH_INC)/mpi2c++ -I$(MPI_F90_MODS)
21 > MPI_INCLUDES= -I$(MPICH_INC) -I$(MPI_F90_MODS)
22  
23   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES) $(MPI_INCLUDES)
24   CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
# Line 54 | Line 54 | CXX_FILES = \
54   C_FILES = $(DIR)/mpiForceField.c
55  
56   CXX_FILES = \
57 +        $(DIR)/Atom.cpp \
58          $(DIR)/Bend.cpp \
59          $(DIR)/BendExtensions.cpp \
60          $(DIR)/Bond.cpp \
61          $(DIR)/BondExtensions.cpp \
61 –        $(DIR)/DipoleTestFF.cpp \
62          $(DIR)/DirectionalAtom.cpp \
63          $(DIR)/DumpWriter.cpp \
64 +        $(DIR)/Exclude.cpp \
65          $(DIR)/InitializeFromFile.cpp \
66          $(DIR)/LJ_FF.cpp \
67          $(DIR)/SimInfo.cpp \
# Line 72 | Line 73 | CXX_FILES = \
73          $(DIR)/Torsion.cpp \
74          $(DIR)/TorsionExtensions.cpp \
75          $(DIR)/TraPPE_ExFF.cpp \
75 –        $(DIR)/TraPPEFF.cpp \
76          $(DIR)/Verlet.cpp \
77          $(DIR)/randomSPRNG.cpp \
78          $(DIR)/fortranWrappers.cpp \
79          $(DIR)/ForceFields.cpp \
80 <        $(DIR)/mpiSimulation.cpp
80 >        $(DIR)/mpiSimulation.cpp \
81 >        $(DIR)/Molecule.cpp
82  
83  
84   F90_FILES= \
# Line 183 | Line 184 | obj/calc_sticky_pair$(O): ./calc_sticky_pair.F90 \
184  
185   obj/calc_sticky_pair$(O): ./calc_sticky_pair.F90 \
186          obj/$(F_MACH_DEFS) \
187 +        obj/simulation_module$(O) \
188          obj/force_globals$(O)
189  
190   obj/calc_gb$(O): ./calc_gb.F90 \
191          obj/$(F_MACH_DEFS) \
192 +        obj/simulation_module$(O) \
193          obj/force_globals$(O)
194  
195   obj/atype_module$(O): ./atype_module.F90 \
# Line 197 | Line 200 | obj/simulation_module$(O): ./simulation_module.F90 \
200  
201   obj/simulation_module$(O): ./simulation_module.F90 \
202          obj/$(F_MACH_DEFS) \
203 +        obj/vector_class$(O) \
204 +        obj/force_globals$(O) \
205          obj/atype_module$(O) \
206          obj/neighborLists$(O)
207  
208   obj/calc_LJ_FF$(O): ./calc_LJ_FF.F90 \
209          obj/$(F_MACH_DEFS) \
210          obj/atype_module$(O) \
211 +        obj/simulation_module$(O) \
212          obj/vector_class$(O) \
213          obj/force_globals$(O)
214  
215   obj/calc_reaction_field$(O): ./calc_reaction_field.F90 \
216          obj/$(F_MACH_DEFS) \
217          obj/vector_class$(O) \
218 +        obj/simulation_module$(O) \
219          obj/atype_module$(O) \
220          obj/force_globals$(O)
221  
222   obj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
223          obj/$(F_MACH_DEFS) \
224          obj/atype_module$(O) \
225 +        obj/simulation_module$(O) \
226          obj/force_globals$(O) \
227          obj/vector_class$(O)
228  
# Line 254 | Line 262 | MPIobj/calc_sticky_pair$(O): ./calc_sticky_pair.F90 \
262  
263   MPIobj/calc_sticky_pair$(O): ./calc_sticky_pair.F90 \
264          MPIobj/$(F_MACH_DEFS) \
265 +        MPIobj/simulation_module$(O) \
266          MPIobj/mpiSimulation_module$(O) \
267          MPIobj/force_globals$(O)
268  
269   MPIobj/calc_gb$(O): ./calc_gb.F90 \
270          MPIobj/$(F_MACH_DEFS) \
271 +        MPIobj/simulation_module$(O) \
272          MPIobj/mpiSimulation_module$(O) \
273          MPIobj/force_globals$(O)
274  
# Line 270 | Line 280 | MPIobj/simulation_module$(O): ./simulation_module.F90
280  
281   MPIobj/simulation_module$(O): ./simulation_module.F90 \
282          MPIobj/$(F_MACH_DEFS) \
283 +        MPIobj/vector_class$(O) \
284 +        MPIobj/force_globals$(O) \
285          MPIobj/mpiSimulation_module$(O) \
286          MPIobj/atype_module$(O) \
287          MPIobj/neighborLists$(O)
288  
289   MPIobj/calc_LJ_FF$(O): ./calc_LJ_FF.F90 \
290          MPIobj/$(F_MACH_DEFS) \
291 +        MPIobj/simulation_module$(O) \
292          MPIobj/mpiSimulation_module$(O) \
293          MPIobj/atype_module$(O) \
294          MPIobj/vector_class$(O) \
# Line 283 | Line 296 | MPIobj/calc_reaction_field$(O): ./calc_reaction_field.
296  
297   MPIobj/calc_reaction_field$(O): ./calc_reaction_field.F90 \
298          MPIobj/$(F_MACH_DEFS) \
299 +        MPIobj/simulation_module$(O) \
300          MPIobj/mpiSimulation_module$(O) \
301          MPIobj/vector_class$(O) \
302          MPIobj/atype_module$(O) \
# Line 290 | Line 304 | MPIobj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F9
304  
305   MPIobj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
306          MPIobj/$(F_MACH_DEFS) \
307 +        MPIobj/simulation_module$(O) \
308          MPIobj/mpiSimulation_module$(O) \
309          MPIobj/atype_module$(O) \
310          MPIobj/force_globals$(O) \

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines