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 940 by gezelter, Tue Jan 13 22:34:55 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 193 | Line 190 | CXX_FILES = \
190          $(DIR)/randomSPRNG.cpp \
191          $(DIR)/fortranWrappers.cpp \
192          $(DIR)/ForceFields.cpp \
196        $(DIR)/mpiSimulation.cpp \
193          $(DIR)/Molecule.cpp \
194          $(DIR)/NPTf.cpp \
195          $(DIR)/NPTi.cpp \
# Line 203 | Line 199 | CXX_FILES = \
199          $(DIR)/ZConstraint.cpp \
200          $(DIR)/ZConsWriter.cpp \
201          $(DIR)/mdProfile.cpp \
202 <        $(DIR)/GenericData.cpp
202 >        $(DIR)/GenericData.cpp \
203 >        $(DIR)/mpiSimulation.cpp
204  
205   F90_FILES= \
206          $(DIR)/definitions_module.F90 \
207          $(DIR)/status_module.F90 \
208          $(DIR)/atype_module.F90 \
209          $(DIR)/calc_dipole_dipole.F90 \
210 +        $(DIR)/calc_charge_charge.F90 \
211          $(DIR)/calc_reaction_field.F90 \
212          $(DIR)/calc_LJ_FF.F90 \
213          $(DIR)/calc_eam.F90 \
# Line 223 | Line 221 | F90_FILES= \
221          $(DIR)/force_globals.F90 \
222          $(DIR)/mpiSimulation_module.F90 \
223          $(DIR)/notifyCutoffs.F90 \
224 <        $(DIR)/oopseMPI_module.F90 \
225 <        $(DIR)/timing.F90
224 >        $(DIR)/timing.F90 \
225 >        $(DIR)/oopseMPI_module.F90
226  
227   DIR:=.
228   C_SRCS   :=     $(C_FILES)
# Line 364 | Line 362 | obj/do_Forces$(O): ./do_Forces.F90 \
362          obj/force_globals$(O) \
363          obj/vector_class$(O)
364  
365 + obj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
366 +        obj/definitions_module$(O) \
367 +        obj/atype_module$(O) \
368 +        obj/simulation_module$(O) \
369 +        obj/force_globals$(O) \
370 +        obj/vector_class$(O)
371 +
372   obj/do_Forces$(O): ./do_Forces.F90 \
373          obj/definitions_module$(O) \
374          obj/atype_module$(O) \
# Line 481 | Line 486 | MPIobj/do_Forces$(O): ./do_Forces.F90 \
486          MPIobj/force_globals$(O) \
487          MPIobj/vector_class$(O)
488  
489 + MPIobj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
490 +        MPIobj/definitions_module$(O) \
491 +        MPIobj/atype_module$(O) \
492 +        MPIobj/simulation_module$(O) \
493 +        MPIobj/mpiSimulation_module$(O) \
494 +        MPIobj/force_globals$(O) \
495 +        MPIobj/vector_class$(O)
496 +
497   MPIobj/do_Forces$(O): ./do_Forces.F90 \
498          MPIobj/definitions_module$(O) \
499          MPIobj/mpiSimulation_module$(O) \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines