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 891 by mmeineke, Fri Dec 19 20:36:35 2003 UTC vs.
Revision 1074 by tim, Mon Mar 1 20:01:50 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 203 | Line 200 | CXX_FILES = \
200          $(DIR)/ZConstraint.cpp \
201          $(DIR)/ZConsWriter.cpp \
202          $(DIR)/mdProfile.cpp \
203 <        $(DIR)/GenericData.cpp
203 >        $(DIR)/GenericData.cpp \
204 >        $(DIR)/mpiSimulation.cpp \
205 >        $(DIR)/Utility.cpp \
206 >        $(DIR)/OOPSEMinimizer.cpp \
207 >        $(DIR)/CGFamilyMinimizer.cpp \
208 >        $(DIR)/PRCG.cpp \
209 >        $(DIR)/SDMinimizer.cpp \
210 >        $(DIR)/ZConsReader.cpp
211  
212 +
213   F90_FILES= \
214          $(DIR)/definitions_module.F90 \
215          $(DIR)/status_module.F90 \
216          $(DIR)/atype_module.F90 \
217          $(DIR)/calc_dipole_dipole.F90 \
218 +        $(DIR)/calc_charge_charge.F90 \
219          $(DIR)/calc_reaction_field.F90 \
220          $(DIR)/calc_LJ_FF.F90 \
221          $(DIR)/calc_eam.F90 \
# Line 223 | Line 229 | F90_FILES= \
229          $(DIR)/force_globals.F90 \
230          $(DIR)/mpiSimulation_module.F90 \
231          $(DIR)/notifyCutoffs.F90 \
232 <        $(DIR)/oopseMPI_module.F90 \
233 <        $(DIR)/timing.F90
232 >        $(DIR)/timing.F90 \
233 >        $(DIR)/oopseMPI_module.F90
234  
235   DIR:=.
236   C_SRCS   :=     $(C_FILES)
# Line 358 | Line 364 | obj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
364          obj/force_globals$(O)
365  
366   obj/calc_dipole_dipole$(O): ./calc_dipole_dipole.F90 \
367 +        obj/definitions_module$(O) \
368 +        obj/atype_module$(O) \
369 +        obj/simulation_module$(O) \
370 +        obj/force_globals$(O) \
371 +        obj/vector_class$(O)
372 +
373 + obj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
374          obj/definitions_module$(O) \
375          obj/atype_module$(O) \
376          obj/simulation_module$(O) \
# Line 481 | Line 494 | MPIobj/do_Forces$(O): ./do_Forces.F90 \
494          MPIobj/force_globals$(O) \
495          MPIobj/vector_class$(O)
496  
497 + MPIobj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
498 +        MPIobj/definitions_module$(O) \
499 +        MPIobj/atype_module$(O) \
500 +        MPIobj/simulation_module$(O) \
501 +        MPIobj/mpiSimulation_module$(O) \
502 +        MPIobj/force_globals$(O) \
503 +        MPIobj/vector_class$(O)
504 +
505   MPIobj/do_Forces$(O): ./do_Forces.F90 \
506          MPIobj/definitions_module$(O) \
507          MPIobj/mpiSimulation_module$(O) \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines