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 761 by gezelter, Fri Sep 12 16:20:16 2003 UTC vs.
Revision 1031 by tim, Fri Feb 6 18:58:06 2004 UTC

# Line 46 | Line 46 | MPI_INC=@MPI_INC@
46   # MPICH include path
47   MPI_INC=@MPI_INC@
48  
49 < # MPI F90 Module path
50 < MPI_F90_MODS=@MPI_F90_MODS@
49 > # MODDIRFLAG
50 > MODDIRFLAG=@MODDIRFLAG@
51  
52   # Compiler dependent Fortran module
53   FLIBS_EXTRA = @F90LIBS@
# Line 95 | Line 95 | CXXFLAGS_C=@CXXFLAGS@
95   # C++ flags
96   CXXFLAGS_C=@CXXFLAGS@
97  
98 + # C++ template flags
99 + OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
100 +
101 + # C++ namespace flags
102 + EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
103 +
104   # Preprocessor flag for fortran
105   PREPFLAG=@PREPFLAG@
106  
# Line 102 | Line 108 | FFLAGS_C=@F90FLAGS@
108   PREPDEFFLAG=@PREPDEFFLAG@
109  
110   # Fortran flags
111 < FFLAGS_C=@F90FLAGS@
111 > FFLAGS_C=@FFLAGS@
112  
113 + # Fortran90 flags
114 + F90FLAGS_C=@F90FLAGS@
115 +
116   # LDFLAGS
117   LDFLAGS=@LDFLAGS@
118  
# Line 115 | Line 124 | MPI_INCLUDES= -I$(MPI_INC) $(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) $(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)
131 < CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
131 > CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
132   FFLAGS=$(PREPFLAG) $(FFLAGS_C)
133 + F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) $(F90_INCLUDES)
134   DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES)
135  
136   MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
137   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
138 < MPI_FFLAGS=$(FFLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
138 > MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
139  
140 < SRC_DIR := $(PWD)
140 > SRC_DIR := ..
141  
142   # Then do the compile rules:
143  
144   obj/%.o: %.F90
145 <        cd obj; $(F90) $(FFLAGS) -c  $(SRC_DIR)/$<
145 >        cd obj; $(F90) $(F90FLAGS) -c  $(SRC_DIR)/$<
146  
147   MPIobj/%.o: %.F90
148 <        cd MPIobj; $(F90) $(MPI_FFLAGS) -c $(SRC_DIR)/$<
148 >        cd MPIobj; $(F90) $(MPI_F90FLAGS) -c $(SRC_DIR)/$<
149  
150   obj/%.o: %.cpp
151          cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
# Line 162 | Line 173 | CXX_FILES = \
173          $(DIR)/BondExtensions.cpp \
174          $(DIR)/DirectionalAtom.cpp \
175          $(DIR)/DumpWriter.cpp \
176 +        $(DIR)/DumpReader.cpp \
177          $(DIR)/Exclude.cpp \
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 178 | Line 191 | CXX_FILES = \
191          $(DIR)/randomSPRNG.cpp \
192          $(DIR)/fortranWrappers.cpp \
193          $(DIR)/ForceFields.cpp \
181        $(DIR)/mpiSimulation.cpp \
194          $(DIR)/Molecule.cpp \
195          $(DIR)/NPTf.cpp \
196          $(DIR)/NPTi.cpp \
197 <        $(DIR)/NPTim.cpp \
186 <        $(DIR)/NPTxym.cpp \
187 <        $(DIR)/NPTzm.cpp \
197 >        $(DIR)/NPTxyz.cpp \
198          $(DIR)/NVT.cpp \
189        $(DIR)/NPTfm.cpp \
199          $(DIR)/SimState.cpp \
200          $(DIR)/ZConstraint.cpp \
201          $(DIR)/ZConsWriter.cpp \
202 <        $(DIR)/GenericData.cpp
202 >        $(DIR)/mdProfile.cpp \
203 >        $(DIR)/GenericData.cpp \
204 >        $(DIR)/mpiSimulation.cpp \
205 >        $(DIR)/NLModel0.cpp \
206 >        $(DIR)/NLModel1.cpp \
207 >        $(DIR)/Constraint.cpp \
208 >        $(DIR)/SimpleBoundCons.cpp \
209 >        $(DIR)/LinearCons.cpp \
210 >        $(DIR)/NonlinearCons.cpp \
211 >        $(DIR)/ConstraintList.cpp \
212 >        $(DIR)/Minimizer1D.cpp \
213 >        $(DIR)/ConjugateMinimizer.cpp \
214 >        $(DIR)/Utility.cpp
215  
216   F90_FILES= \
217          $(DIR)/definitions_module.F90 \
218          $(DIR)/status_module.F90 \
219          $(DIR)/atype_module.F90 \
220          $(DIR)/calc_dipole_dipole.F90 \
221 +        $(DIR)/calc_charge_charge.F90 \
222          $(DIR)/calc_reaction_field.F90 \
223          $(DIR)/calc_LJ_FF.F90 \
224          $(DIR)/calc_eam.F90 \
# Line 209 | Line 231 | F90_FILES= \
231          $(DIR)/calc_gb.F90 \
232          $(DIR)/force_globals.F90 \
233          $(DIR)/mpiSimulation_module.F90 \
234 <        $(DIR)/notifyCutoffs.F90
234 >        $(DIR)/notifyCutoffs.F90 \
235 >        $(DIR)/timing.F90 \
236 >        $(DIR)/oopseMPI_module.F90
237  
238   DIR:=.
239   C_SRCS   :=     $(C_FILES)
# Line 349 | Line 373 | obj/do_Forces$(O): ./do_Forces.F90 \
373          obj/force_globals$(O) \
374          obj/vector_class$(O)
375  
376 + obj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
377 +        obj/definitions_module$(O) \
378 +        obj/atype_module$(O) \
379 +        obj/simulation_module$(O) \
380 +        obj/force_globals$(O) \
381 +        obj/vector_class$(O)
382 +
383   obj/do_Forces$(O): ./do_Forces.F90 \
384          obj/definitions_module$(O) \
385          obj/atype_module$(O) \
# Line 380 | Line 411 | obj/wrappers$(O): ./wrappers.F90 \
411          obj/do_Forces$(O) \
412          obj/notifyCutoffs$(O)
413  
414 + obj/timing$(O): ./timing.F90 \
415 +        obj/do_Forces$(O)
416  
417  
418  
386
387
419   #MPI dependencies:
420  
421   MPIobj/definitions_module$(O): ./definitions_module.F90
# Line 393 | Line 424 | MPIobj/mpiSimulation_module$(O): ./mpiSimulation_modul
424  
425   MPIobj/status_module$(O): ./status_module.F90
426  
427 < MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90
427 > MPIobj/oopseMPI_module$(O): ./oopseMPI_module.F90
428  
429 + MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90 \
430 +        MPIobj/oopseMPI_module$(O)
431 +
432   MPIobj/force_globals$(O): ./force_globals.F90 \
433          MPIobj/mpiSimulation_module$(O) \
434          MPIobj/definitions_module$(O)
# Line 463 | Line 497 | MPIobj/do_Forces$(O): ./do_Forces.F90 \
497          MPIobj/force_globals$(O) \
498          MPIobj/vector_class$(O)
499  
500 + MPIobj/calc_charge_charge$(O): ./calc_charge_charge.F90 \
501 +        MPIobj/definitions_module$(O) \
502 +        MPIobj/atype_module$(O) \
503 +        MPIobj/simulation_module$(O) \
504 +        MPIobj/mpiSimulation_module$(O) \
505 +        MPIobj/force_globals$(O) \
506 +        MPIobj/vector_class$(O)
507 +
508   MPIobj/do_Forces$(O): ./do_Forces.F90 \
509          MPIobj/definitions_module$(O) \
510          MPIobj/mpiSimulation_module$(O) \
# Line 496 | Line 538 | MPIobj/wrappers$(O): ./wrappers.F90 \
538          MPIobj/do_Forces$(O) \
539          MPIobj/notifyCutoffs$(O)  
540  
541 + MPIobj/timing$(O): ./timing.F90 \
542 +        MPIobj/do_Forces$(O) \
543 +        MPIobj/mpiSimulation_module$(O)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines