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 278 by mmeineke, Wed Feb 19 21:37:04 2003 UTC vs.
Revision 289 by mmeineke, Thu Feb 27 18:47:45 2003 UTC

# Line 21 | Line 21 | mpiSimulation.hpp mpiComponentPlan.h
21   pkginclude_HEADERS = AbstractClasses.hpp Atom.hpp ForceFields.hpp \
22   Integrator.hpp ReadWrite.hpp SimInfo.hpp SimSetup.hpp SRI.hpp     \
23   Thermo.hpp Molecule.hpp randomSPRNG.hpp mpiForceField.h           \
24 < mpiSimulation.hpp mpiComponentPlan.h
24 > mpiSimulation.hpp mpiComponentPlan.h fSimulation.h
25  
26 < libmdCode_a_SOURCES = forceFactory.hpp fortranFncs.h Bend.cpp        \
27 < BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp      \
28 < DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp  \
29 < SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp    \
30 < Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp       \
31 < Verlet.cpp randomSPRNG.cpp atype_typedefs.F90 f_verlet_constrained.f \
32 < generic_atype_recombination.F90 simulation_module.F90 lj_FF.F90      \
33 < wrappers.F90 forceFactory.F90
26 > libmdCode_a_SOURCES = forceFactory.hpp fortranFncs.h Bend.cpp       \
27 > BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp     \
28 > DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
29 > ssdFF++.cpp SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp  \
30 > Thermo.cpp Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp        \
31 > TraPPEFF.cpp Verlet.cpp randomSPRNG.cpp atype_typedefs.F90          \
32 > f_verlet_constrained.f generic_atype_recombination.F90              \
33 > simulation_module.F90 lj_FF.F90 wrappers.F90 forceFactory.F90       \
34 > neighborLists.F90 ssd_FF.F90
35  
36   #compiler and machine dependent fortran definitions
37  
# Line 49 | Line 50 | wrappers.o: wrappers.F90 simulation_module.o @fortran_
50   lj_FF.o: lj_FF.F90  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
51          atype_typedefs.o
52  
53 + ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
54 +        atype_typedefs.o
55 +
56   wrappers.o: wrappers.F90 simulation_module.o @fortran_machine_defs@
57  
58 + neighborLists.o: neighborLists.F90 simulation_module.o @fortran_machine_defs@
59 +
60   forceFactory.o: forceFactory.F90 lj_FF.o @fortran_machine_defs@
61  
62   #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
# Line 64 | Line 70 | SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp
70   libMPImdCode_a_SOURCES = forceFactory.hpp fortranFncs.h Bend.cpp    \
71   BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp     \
72   DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
73 < SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp   \
74 < Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp      \
75 < Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f mpiForceField.c   \
76 < mpiSimulation.cpp mpiSimulation_module.F90
73 > ssdFF++.cpp SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp  \
74 > Thermo.cpp Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp        \
75 > TraPPEFF.cpp Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f      \
76 > mpiForceField.c mpiSimulation.cpp mpiSimulation_module.F90
77  
78   EXTRA_libMPImdCode_a_SOURCES = Linux_ifc_machdep.F90
79  
# Line 76 | Line 82 | libMPImdCode_a-forceFactory.$(OBJEXT)
82   libMPImdCode_a-generic_atype_recombination.$(OBJEXT)             \
83   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
84   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
85 < libMPImdCode_a-forceFactory.$(OBJEXT)
85 > libMPImdCode_a-forceFactory.$(OBJEXT)                            \
86 > libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
87 > libMPImdCode_a-neighborLists.$(OBJEXT)
88  
89   libMPImdCode_a_DEPENDENCIES = @fortran_machine_defs@             \
90   libMPImdCode_a-atype_typedefs.$(OBJEXT)                          \
91   libMPImdCode_a-generic_atype_recombination.$(OBJEXT)             \
92   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
93   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
94 < libMPImdCode_a-forceFactory.$(OBJEXT)
94 > libMPImdCode_a-forceFactory.$(OBJEXT)                            \
95 > libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
96 > libMPImdCode_a-neighborLists.$(OBJEXT)
97  
98   libMPImdCode_a_CFLAGS = -DIS_MPI $(AM_CFLAGS)
99   libMPImdCode_a_CXXFLAGS =  -DIS_MPI $(AM_CXXFLAGS)
# Line 107 | Line 117 | libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a
117          libMPImdCode_a-generic_atype_recombination.o libMPImdCode_a-atype_typedefs.o @fortran_machine_defs@  
118          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-lj_FF.o `test -f 'lj_FF.F90' || echo '$(srcdir)/'`lj_FF.F90
119  
120 + libMPImdCode_a-ssd_FF.o: ssd_FF.F90 libMPImdCode_a-simulation_module.o \
121 +        libMPImdCode_a-generic_atype_recombination.o libMPImdCode_a-atype_typedefs.o @fortran_machine_defs@  
122 +        $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-ssd_FF.o `test -f 'ssd_FF.F90' || echo '$(srcdir)/'`ssd_FF.F90
123 +
124   libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a-simulation_module.o @fortran_machine_defs@
125          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-wrappers.o `test -f 'wrappers.F90' || echo '$(srcdir)/'`wrappers.F90
126  
127 + libMPImdCode_a-neighborLists.o: neighborLists.F90 mpiSimulation_module.o \
128 +        libMPImdCode_a-simulation_module.o @fortran_machine_defs@
129 +        $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-neighborLists.o `test -f 'neighborLists.F90' || echo '$(srcdir)/'`neighborLists.F90
130 +
131   libMPImdCode_a-forceFactory.o: forceFactory.F90 libMPImdCode_a-lj_FF.o @fortran_machine_defs@
132          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-forceFactory.o `test -f 'forceFactory.F90' || echo '$(srcdir)/'`forceFactory.F90
133  
134   mpiSimulation_module.o: mpiSimulation_module.F90 @fortran_machine_defs@
135          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o mpiSimulation_module.o `test -f 'mpiSimulation_module.F90' || echo '$(srcdir)/'`mpiSimulation_module.F90
118 –        
136  
137 +
138   #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
139   #       atype_typedefs.o
140  

Diff Legend

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