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 379 by mmeineke, Fri Mar 21 17:52:35 2003 UTC vs.
Revision 460 by chuckv, Fri Apr 4 22:22:30 2003 UTC

# Line 12 | Line 12 | DECLARES= -DFRC_PATH="$(OOPSE_HOME)/forcefields"
12  
13   # First do compile-time flags:
14  
15 < DECLARES= -DFRC_PATH="$(OOPSE_HOME)/forcefields"
15 > DECLARES= -DFRC_PATH="$(FORCE_PARAM_DIR)"
16   MPI_DECLARES= -DIS_MPI
17  
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 101 | Line 102 | F90_SRCS :=    $(F90_FILES)
102   C_SRCS   :=     $(C_FILES)
103   CXX_SRCS :=     $(CXX_FILES)
104   F90_SRCS :=     $(F90_FILES)
105 + SRCS     :=     $(C_SRCS) $(CXX_SRCS) $(F90_SRCS)
106  
107   DIR:=obj
108   C_OBJS   :=     $(C_FILES:.c=.o)
# Line 144 | Line 146 | distclean : dummy
146          for i in $(LIBSUBDIRS); do \
147            (cd $$i; $(RM) *.o *.mod) || exit 1; \
148          done
149 <        $(RM) libmdtools.a libmdtools_MPI.a *.o *.mod *~ Make.temp Make.ftemp
149 >        $(RM) libmdtools.a libmdtools_MPI.a *.o *.mod *~ Make.temp Make.ftemp Make.dep
150  
151 < Make.dep: depend
151 > depend : Make.dep
152  
153 < depend :
153 > Make.dep : $(SRCS)
154          echo "Only C dependencies are made automagically!"
155          echo "# DO NOT DELETE THIS LINE - used by make depend" > Make.dep
156          $(CC) $(DEPFLAGS) -MM $(C_SRCS) $(CXX_SRCS) \
157                  | sed 's/\.o:/\$$(O)\ :/g' > Make.temp
158          cat Make.temp | sed 's/^/obj\//' >> Make.dep
159          cat Make.temp | sed 's/^/MPIobj\//' >> Make.dep
160 < #       ../utils/sfmakedepend -I $(MPI_F90_MODS) -d obj -f ./Make.ftemp -h *.F90
161 < #       ../utils/sfmakedepend -I $(MPI_F90_MODS) -d MPIobj -f ./Make.ftemp -h *.F90
160 > #       ../scripts/sfmakedepend -I $(MPI_F90_MODS) -d obj -f ./Make.ftemp -h *.F90
161 > #       ../scripts/sfmakedepend -I $(MPI_F90_MODS) -d MPIobj -f ./Make.ftemp -h *.F90
162   #       cat Make.ftemp | sed 's/\.o:/\$$(O)\ :/g' >> Make.dep
163          $(RM) Make.ftemp Make.temp
164  
# Line 170 | Line 172 | include Make.dep
172  
173   include Make.dep
174  
175 < # known dependencies
175 > obj/$(F_MACH_DEFS): ./Linux_ifc_machdep.F90
176  
177 < obj/$(F_MACH_DEFS): Linux_ifc_machdep.F90
177 > obj/vector_class$(O): ./vector_class.F90
178  
179 < obj/vector_class$(O): vector_class.F90
178 <
179 < obj/force_globals$(O): force_globals.F90 \
179 > obj/force_globals$(O): ./force_globals.F90 \
180          obj/$(F_MACH_DEFS)
181  
182 < obj/neighborLists$(O): neighborLists.F90 \
182 > obj/neighborLists$(O): ./neighborLists.F90 \
183          obj/$(F_MACH_DEFS)
184  
185 < obj/calc_sticky_pair$(O): calc_sticky_pair.F90 \
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 \
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 \
195 > obj/atype_module$(O): ./atype_module.F90 \
196          obj/$(F_MACH_DEFS) \
197          obj/vector_class$(O) \
198          obj/calc_sticky_pair$(O) \
199          obj/calc_gb$(O)
200  
201 < obj/simulation_module$(O): simulation_module.F90 \
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 \
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 \
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 \
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  
229 < obj/do_Forces$(O): do_Forces.F90 \
229 > obj/do_Forces$(O): ./do_Forces.F90 \
230          obj/$(F_MACH_DEFS) \
231          obj/simulation_module$(O) \
232          obj/atype_module$(O) \
# Line 231 | Line 238 | obj/wrappers$(O): wrappers.F90 \
238          obj/calc_gb$(O) \
239          obj/force_globals$(O)
240  
241 < obj/wrappers$(O): wrappers.F90 \
241 > obj/wrappers$(O): ./wrappers.F90 \
242          obj/$(F_MACH_DEFS) \
243          obj/simulation_module$(O) \
244          obj/atype_module$(O) \
# Line 239 | Line 246 | MPIobj/$(F_MACH_DEFS): Linux_ifc_machdep.F90
246  
247   #MPI dependencies:
248  
249 < MPIobj/$(F_MACH_DEFS): Linux_ifc_machdep.F90
249 > MPIobj/$(F_MACH_DEFS): ./Linux_ifc_machdep.F90
250  
251 < MPIobj/vector_class$(O): vector_class.F90
251 > MPIobj/vector_class$(O): ./vector_class.F90
252  
253 < MPIobj/mpiSimulation_module$(O): mpiSimulation_module.F90
253 > MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90
254  
255 < MPIobj/force_globals$(O): force_globals.F90 \
255 > MPIobj/force_globals$(O): ./force_globals.F90 \
256          MPIobj/mpiSimulation_module$(O) \
257          MPIobj/$(F_MACH_DEFS)
258  
259 < MPIobj/neighborLists$(O): neighborLists.F90 \
259 > MPIobj/neighborLists$(O): ./neighborLists.F90 \
260          MPIobj/$(F_MACH_DEFS) \
261          MPIobj/mpiSimulation_module$(O)
262  
263 < MPIobj/calc_sticky_pair$(O): calc_sticky_pair.F90 \
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 \
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  
275 < MPIobj/atype_module$(O): atype_module.F90 \
275 > MPIobj/atype_module$(O): ./atype_module.F90 \
276          MPIobj/$(F_MACH_DEFS) \
277          MPIobj/vector_class$(O) \
278          MPIobj/calc_sticky_pair$(O) \
279          MPIobj/calc_gb$(O)
280  
281 < MPIobj/simulation_module$(O): simulation_module.F90 \
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 \
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) \
295          MPIobj/force_globals$(O)
296  
297 < MPIobj/calc_reaction_field$(O): calc_reaction_field.F90 \
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) \
303          MPIobj/force_globals$(O)
304  
305 < MPIobj/calc_dipole_dipole$(O): calc_dipole_dipole.F90 \
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) \
311          MPIobj/vector_class$(O)
312  
313 < MPIobj/do_Forces$(O): do_Forces.F90 \
313 > MPIobj/do_Forces$(O): ./do_Forces.F90 \
314          MPIobj/$(F_MACH_DEFS) \
315          MPIobj/mpiSimulation_module$(O) \
316          MPIobj/simulation_module$(O) \
# Line 309 | Line 323 | MPIobj/wrappers$(O): wrappers.F90 \
323          MPIobj/calc_gb$(O) \
324          MPIobj/force_globals$(O)
325  
326 < MPIobj/wrappers$(O): wrappers.F90 \
326 > MPIobj/wrappers$(O): ./wrappers.F90 \
327          MPIobj/$(F_MACH_DEFS) \
328          MPIobj/mpiSimulation_module$(O) \
329          MPIobj/simulation_module$(O) \
330          MPIobj/atype_module$(O) \
331          MPIobj/do_Forces$(O)
318 –
319 –

Diff Legend

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