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 853 by mmeineke, Thu Nov 6 19:11:38 2003 UTC vs.
Revision 891 by mmeineke, Fri Dec 19 20:36:35 2003 UTC

# Line 128 | Line 128 | MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS
128  
129   INCLUDES= -I.. -I../../libBASS $(SPRNG_INC)
130   MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS)
131 + F90_INCLUDES= -I/usr/local/include
132  
133   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP)
134   CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
135   FFLAGS=$(PREPFLAG) $(FFLAGS_C)
136 < F90FLAGS=$(PREPFLAG) $(F90FLAGS_C)
136 > F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) $(F90_INCLUDES)
137   DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES)
138  
139   MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
# Line 194 | Line 195 | CXX_FILES = \
195          $(DIR)/ForceFields.cpp \
196          $(DIR)/mpiSimulation.cpp \
197          $(DIR)/Molecule.cpp \
197        $(DIR)/NPT.cpp \
198          $(DIR)/NPTf.cpp \
199          $(DIR)/NPTi.cpp \
200          $(DIR)/NPTxyz.cpp \
# Line 202 | Line 202 | CXX_FILES = \
202          $(DIR)/SimState.cpp \
203          $(DIR)/ZConstraint.cpp \
204          $(DIR)/ZConsWriter.cpp \
205 +        $(DIR)/mdProfile.cpp \
206          $(DIR)/GenericData.cpp
207  
208   F90_FILES= \
# Line 221 | Line 222 | F90_FILES= \
222          $(DIR)/calc_gb.F90 \
223          $(DIR)/force_globals.F90 \
224          $(DIR)/mpiSimulation_module.F90 \
225 <        $(DIR)/notifyCutoffs.F90
225 >        $(DIR)/notifyCutoffs.F90 \
226 >        $(DIR)/oopseMPI_module.F90 \
227 >        $(DIR)/timing.F90
228  
229   DIR:=.
230   C_SRCS   :=     $(C_FILES)
# Line 392 | Line 395 | obj/wrappers$(O): ./wrappers.F90 \
395          obj/do_Forces$(O) \
396          obj/notifyCutoffs$(O)
397  
398 <
399 <
398 > obj/timing$(O): ./timing.F90 \
399 >        obj/do_Forces$(O)
400  
401  
402  
# Line 405 | Line 408 | MPIobj/mpiSimulation_module$(O): ./mpiSimulation_modul
408  
409   MPIobj/status_module$(O): ./status_module.F90
410  
411 < MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90
411 > MPIobj/oopseMPI_module$(O): ./oopseMPI_module.F90
412  
413 + MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90 \
414 +        MPIobj/oopseMPI_module$(O)
415 +
416   MPIobj/force_globals$(O): ./force_globals.F90 \
417          MPIobj/mpiSimulation_module$(O) \
418          MPIobj/definitions_module$(O)
# Line 508 | Line 514 | MPIobj/wrappers$(O): ./wrappers.F90 \
514          MPIobj/do_Forces$(O) \
515          MPIobj/notifyCutoffs$(O)  
516  
517 + MPIobj/timing$(O): ./timing.F90 \
518 +        MPIobj/do_Forces$(O) \
519 +        MPIobj/mpiSimulation_module$(O)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines