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

Comparing:
branches/mmeineke/OOPSE/libmdtools/Makefile (file contents), Revision 377 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
trunk/OOPSE/libmdtools/Makefile (file contents), Revision 425 by mmeineke, Thu Mar 27 20:39:09 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!!!
# 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 120 | Line 122 | all: libmdtools.a libmdtools_MPI.a
122  
123   # Possible make targets:
124  
125 < all: libmdtools.a libmdtools_MPI.a
125 > all: Make.dep libmdtools.a libmdtools_MPI.a
126  
127   libmdtools.a: $(OBJS)
128          $(RM) $@
# 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 < depend :
151 > depend : Make.dep
152 >
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 168 | 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
176 <
177 < 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/force_globals$(O)
188  
189 < obj/calc_gb$(O): calc_gb.F90 \
189 > obj/calc_gb$(O): ./calc_gb.F90 \
190          obj/$(F_MACH_DEFS) \
191          obj/force_globals$(O)
192  
193 < obj/atype_module$(O): atype_module.F90 \
193 > obj/atype_module$(O): ./atype_module.F90 \
194          obj/$(F_MACH_DEFS) \
195          obj/vector_class$(O) \
196          obj/calc_sticky_pair$(O) \
197          obj/calc_gb$(O)
198  
199 < obj/simulation_module$(O): simulation_module.F90 \
199 > obj/simulation_module$(O): ./simulation_module.F90 \
200          obj/$(F_MACH_DEFS) \
201          obj/atype_module$(O) \
202          obj/neighborLists$(O)
203  
204 < obj/calc_LJ_FF$(O): calc_LJ_FF.F90 \
204 > obj/calc_LJ_FF$(O): ./calc_LJ_FF.F90 \
205          obj/$(F_MACH_DEFS) \
206          obj/atype_module$(O) \
207          obj/vector_class$(O) \
208          obj/force_globals$(O)
209  
210 < obj/calc_reaction_field$(O): calc_reaction_field.F90 \
210 > obj/calc_reaction_field$(O): ./calc_reaction_field.F90 \
211          obj/$(F_MACH_DEFS) \
212          obj/vector_class$(O) \
213          obj/atype_module$(O) \
214          obj/force_globals$(O)
215  
216 < obj/calc_dipole_dipole$(O): calc_dipole_dipole.F90 \
216 > obj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
217          obj/$(F_MACH_DEFS) \
218          obj/atype_module$(O) \
219          obj/force_globals$(O) \
220          obj/vector_class$(O)
221  
222 < obj/do_Forces$(O): do_Forces.F90 \
222 > obj/do_Forces$(O): ./do_Forces.F90 \
223          obj/$(F_MACH_DEFS) \
224          obj/simulation_module$(O) \
225          obj/atype_module$(O) \
# Line 229 | Line 231 | obj/wrappers$(O): wrappers.F90 \
231          obj/calc_gb$(O) \
232          obj/force_globals$(O)
233  
234 < obj/wrappers$(O): wrappers.F90 \
234 > obj/wrappers$(O): ./wrappers.F90 \
235          obj/$(F_MACH_DEFS) \
236          obj/simulation_module$(O) \
237          obj/atype_module$(O) \
# Line 237 | Line 239 | MPIobj/$(F_MACH_DEFS): Linux_ifc_machdep.F90
239  
240   #MPI dependencies:
241  
242 < MPIobj/$(F_MACH_DEFS): Linux_ifc_machdep.F90
242 > MPIobj/$(F_MACH_DEFS): ./Linux_ifc_machdep.F90
243  
244 < MPIobj/vector_class$(O): vector_class.F90
244 > MPIobj/vector_class$(O): ./vector_class.F90
245  
246 < MPIobj/mpiSimulation_module$(O): mpiSimulation_module.F90
246 > MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90
247  
248 < MPIobj/force_globals$(O): force_globals.F90 \
248 > MPIobj/force_globals$(O): ./force_globals.F90 \
249          MPIobj/mpiSimulation_module$(O) \
250          MPIobj/$(F_MACH_DEFS)
251  
252 < MPIobj/neighborLists$(O): neighborLists.F90 \
252 > MPIobj/neighborLists$(O): ./neighborLists.F90 \
253          MPIobj/$(F_MACH_DEFS) \
254          MPIobj/mpiSimulation_module$(O)
255  
256 < MPIobj/calc_sticky_pair$(O): calc_sticky_pair.F90 \
256 > MPIobj/calc_sticky_pair$(O): ./calc_sticky_pair.F90 \
257          MPIobj/$(F_MACH_DEFS) \
258          MPIobj/mpiSimulation_module$(O) \
259          MPIobj/force_globals$(O)
260  
261 < MPIobj/calc_gb$(O): calc_gb.F90 \
261 > MPIobj/calc_gb$(O): ./calc_gb.F90 \
262          MPIobj/$(F_MACH_DEFS) \
263          MPIobj/mpiSimulation_module$(O) \
264          MPIobj/force_globals$(O)
265  
266 < MPIobj/atype_module$(O): atype_module.F90 \
266 > MPIobj/atype_module$(O): ./atype_module.F90 \
267          MPIobj/$(F_MACH_DEFS) \
268          MPIobj/vector_class$(O) \
269          MPIobj/calc_sticky_pair$(O) \
270          MPIobj/calc_gb$(O)
271  
272 < MPIobj/simulation_module$(O): simulation_module.F90 \
272 > MPIobj/simulation_module$(O): ./simulation_module.F90 \
273          MPIobj/$(F_MACH_DEFS) \
274          MPIobj/mpiSimulation_module$(O) \
275          MPIobj/atype_module$(O) \
276          MPIobj/neighborLists$(O)
277  
278 < MPIobj/calc_LJ_FF$(O): calc_LJ_FF.F90 \
278 > MPIobj/calc_LJ_FF$(O): ./calc_LJ_FF.F90 \
279          MPIobj/$(F_MACH_DEFS) \
280          MPIobj/mpiSimulation_module$(O) \
281          MPIobj/atype_module$(O) \
282          MPIobj/vector_class$(O) \
283          MPIobj/force_globals$(O)
284  
285 < MPIobj/calc_reaction_field$(O): calc_reaction_field.F90 \
285 > MPIobj/calc_reaction_field$(O): ./calc_reaction_field.F90 \
286          MPIobj/$(F_MACH_DEFS) \
287          MPIobj/mpiSimulation_module$(O) \
288          MPIobj/vector_class$(O) \
289          MPIobj/atype_module$(O) \
290          MPIobj/force_globals$(O)
291  
292 < MPIobj/calc_dipole_dipole$(O): calc_dipole_dipole.F90 \
292 > MPIobj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
293          MPIobj/$(F_MACH_DEFS) \
294          MPIobj/mpiSimulation_module$(O) \
295          MPIobj/atype_module$(O) \
296          MPIobj/force_globals$(O) \
297          MPIobj/vector_class$(O)
298  
299 < MPIobj/do_Forces$(O): do_Forces.F90 \
299 > MPIobj/do_Forces$(O): ./do_Forces.F90 \
300          MPIobj/$(F_MACH_DEFS) \
301          MPIobj/mpiSimulation_module$(O) \
302          MPIobj/simulation_module$(O) \
# Line 307 | Line 309 | MPIobj/wrappers$(O): wrappers.F90 \
309          MPIobj/calc_gb$(O) \
310          MPIobj/force_globals$(O)
311  
312 < MPIobj/wrappers$(O): wrappers.F90 \
312 > MPIobj/wrappers$(O): ./wrappers.F90 \
313          MPIobj/$(F_MACH_DEFS) \
314          MPIobj/mpiSimulation_module$(O) \
315          MPIobj/simulation_module$(O) \
316          MPIobj/atype_module$(O) \
317          MPIobj/do_Forces$(O)
316 –
317 –

Diff Legend

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