ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE_old/src/mdtools/libmdCode/Makefile.am
(Generate patch)

Comparing trunk/OOPSE_old/src/mdtools/libmdCode/Makefile.am (file contents):
Revision 365 by mmeineke, Tue Mar 18 22:17:31 2003 UTC vs.
Revision 367 by mmeineke, Wed Mar 19 17:29:49 2003 UTC

# Line 26 | Line 26 | Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraP
26   BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp     \
27   DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
28   SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp   \
29 < Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp      \
30 < Verlet.cpp randomSPRNG.cpp fortranWrappers.cpp ForceFields.cpp      \
31 < atype_module.F90 f_verlet_constrained.f calc_dipole_dipole.F90      \
32 < calc_reaction_field.F90 calc_LJ_FF.F90 calc_sticky_pair.F90         \
33 < doForces.F90 vector_class.F90 simulation_module.F90 wrappers.F90    \
34 < neighborLists.F90 calc_gb.F90 force_globals.F90
29 > GhostBend.cpp Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp     \
30 > TraPPEFF.cpp Verlet.cpp randomSPRNG.cpp fortranWrappers.cpp         \
31 > ForceFields.cpp atype_module.F90 f_verlet_constrained.f             \
32 > calc_dipole_dipole.F90 calc_reaction_field.F90 calc_LJ_FF.F90       \
33 > calc_sticky_pair.F90 do_Forces.F90 vector_class.F90                 \
34 > simulation_module.F90 wrappers.F90 neighborLists.F90 calc_gb.F90    \
35 > force_globals.F90
36  
37   libmdCode_a_CXXFLAGS = -DFRC_PATH="$(pkgdatadir)" $(AM_CXXFLAGS)
38  
# Line 44 | Line 45 | atype_module.o: atype_module.F90 @fortran_machine_defs
45  
46   #fortran module dependencies
47  
48 < atype_module.o: atype_module.F90 @fortran_machine_defs@ vector_class.o
48 > atype_module.o: atype_module.F90 @fortran_machine_defs@ vector_class.o calc_sticky_pair.o calc_gb.o
49  
50 < simulation_module.o: simulation_module.F90 @fortran_machine_defs@ atype_module.o neighborList.o
50 > simulation_module.o: simulation_module.F90 @fortran_machine_defs@ atype_module.o neighborLists.o
51  
52   wrappers.o: wrappers.F90 simulation_module.o @fortran_machine_defs@ \
53          do_Forces.o atype_module.o
# Line 76 | Line 77 | Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraP
77   BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp     \
78   DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
79   SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp   \
80 < Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp      \
81 < fortranWrappers.cpp ForceFields.cpp Verlet.cpp randomSPRNG.cpp      \
82 < f_verlet_constrained.f mpiForceField.c mpiSimulation.cpp            \
83 < mpiSimulation_module.F90
80 > GhostBend.cpp Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp     \
81 > TraPPEFF.cpp fortranWrappers.cpp ForceFields.cpp Verlet.cpp         \
82 > randomSPRNG.cpp f_verlet_constrained.f mpiForceField.c              \
83 > mpiSimulation.cpp mpiSimulation_module.F90
84  
85   EXTRA_libMPImdCode_a_SOURCES = Linux_ifc_machdep.F90
86  
# Line 93 | Line 94 | libMPImdCode_a-vector_class.$(OBJEXT)
94   libMPImdCode_a-calc_sticky_pair.$(OBJEXT)                            \
95   libMPImdCode_a-do_Forces.$(OBJEXT) \
96   libMPImdCode_a-wrappers.$(OBJEXT) \
97 + libMPImdCode_a-calc_gb.$(OBJEXT) \
98 + libMPImdCode_a-force_globals.$(OBJEXT) \
99   libMPImdCode_a-vector_class.$(OBJEXT)
100  
101   libMPImdCode_a_DEPENDENCIES = @fortran_machine_defs@                 \
# Line 115 | Line 118 | libMPImdCode_a-atype_module.o: atype_module.F90 @fortr
118  
119   #fortran module dependencies
120  
121 < libMPImdCode_a-atype_module.o: atype_module.F90 @fortran_machine_defs@ libMPImdCode_a-vector_class.o
121 > libMPImdCode_a-atype_module.o: atype_module.F90 @fortran_machine_defs@ libMPImdCode_a-vector_class.o libMPImdCode_a-calc_gb.o libMPImdCode_a-calc_sticky_pair.o
122          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-atype_module.o `test -f 'atype_module.F90' || echo '$(srcdir)/'`atype_module.F90
123  
124   libMPImdCode_a-simulation_module.o: simulation_module.F90 @fortran_machine_defs@ mpiSimulation_module.o \
125 <        libMPImdCode_a-atype_module.o libMPImdCode_a-neighborLists.o
125 >        libMPImdCode_a-atype_module.o libMPImdCode_a-neighborLists.o libMPImdCode_a-force_globals.o
126          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-simulation_module.o `test -f 'simulation_module.F90' || echo '$(srcdir)/'`simulation_module.F90
127  
128 < libMPImdCode_a-force_globals.o: simulation_module.F90 @fortran_machine_defs@ mpiSimulation_module.o
128 > libMPImdCode_a-force_globals.o: force_globals.F90 @fortran_machine_defs@ mpiSimulation_module.o
129          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-force_globals.o `test -f 'force_globals.F90' || echo '$(srcdir)/'`force_globals.F90
130  
131   libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a-simulation_module.o @fortran_machine_defs@ \

Diff Legend

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