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 289 by mmeineke, Thu Feb 27 18:47:45 2003 UTC vs.
Revision 291 by mmeineke, Wed Mar 5 20:35:54 2003 UTC

# Line 23 | Line 23 | libmdCode_a_SOURCES = forceFactory.hpp fortranFncs.h B
23   Thermo.hpp Molecule.hpp randomSPRNG.hpp mpiForceField.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 < 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
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 neighborLists.F90
34  
35 +
36 +
37   #compiler and machine dependent fortran definitions
38  
39   EXTRA_libmdCode_a_SOURCES = Linux_ifc_machdep.F90
40   libmdCode_a_LIBADD = @fortran_machine_defs@
41  
42  
43 < #ssd_FF.F90 TraPPE_ExFF_module.F90  
43 > #fortran module dependencies
44  
45   atype_typedefs.o: atype_typedefs.F90 @fortran_machine_defs@
46  
# Line 50 | Line 51 | ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulatio
51   lj_FF.o: lj_FF.F90  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
52          atype_typedefs.o
53  
54 < ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
55 <        atype_typedefs.o
54 > #ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
55 > #       atype_typedefs.o
56  
57   wrappers.o: wrappers.F90 simulation_module.o @fortran_machine_defs@
58  
# Line 59 | Line 60 | forceFactory.o: forceFactory.F90 lj_FF.o @fortran_mach
60  
61   forceFactory.o: forceFactory.F90 lj_FF.o @fortran_machine_defs@
62  
62 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
63 – #       atype_typedefs.o
63  
64  
65   #*****************************************************************
# Line 70 | Line 69 | ssdFF++.cpp SimInfo.cpp SimSetup.cpp StatWriter.cpp Sy
69   libMPImdCode_a_SOURCES = forceFactory.hpp fortranFncs.h Bend.cpp    \
70   BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp     \
71   DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
72 < ssdFF++.cpp SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp  \
73 < Thermo.cpp Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp        \
74 < TraPPEFF.cpp Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f      \
75 < mpiForceField.c mpiSimulation.cpp mpiSimulation_module.F90
72 > SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp   \
73 > Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp      \
74 > Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f mpiForceField.c   \
75 > mpiSimulation.cpp mpiSimulation_module.F90
76  
77   EXTRA_libMPImdCode_a_SOURCES = Linux_ifc_machdep.F90
78  
# Line 92 | Line 91 | libMPImdCode_a-ssd_FF.$(OBJEXT)                      
91   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
92   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
93   libMPImdCode_a-forceFactory.$(OBJEXT)                            \
94 < libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
94 > #libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
95   libMPImdCode_a-neighborLists.$(OBJEXT)
96  
97   libMPImdCode_a_CFLAGS = -DIS_MPI $(AM_CFLAGS)
98   libMPImdCode_a_CXXFLAGS =  -DIS_MPI $(AM_CXXFLAGS)
99   libMPImdCode_a_FFLAGS =  -DIS_MPI $(AM_FFLAGS)
100  
101 + #fortran module dependencies
102  
103 –
104 – #ssd_FF.F90 TraPPE_ExFF_module.F90  
105 –
103   libMPImdCode_a-atype_typedefs.o: atype_typedefs.F90 @fortran_machine_defs@
104          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-atype_typedefs.o `test -f 'atype_typedefs.F90' || echo '$(srcdir)/'`atype_typedefs.F90
105  
# Line 117 | Line 114 | libMPImdCode_a-ssd_FF.o: ssd_FF.F90 libMPImdCode_a-sim
114          libMPImdCode_a-generic_atype_recombination.o libMPImdCode_a-atype_typedefs.o @fortran_machine_defs@  
115          $(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
116  
117 < libMPImdCode_a-ssd_FF.o: ssd_FF.F90 libMPImdCode_a-simulation_module.o \
118 <        libMPImdCode_a-generic_atype_recombination.o libMPImdCode_a-atype_typedefs.o @fortran_machine_defs@  
119 <        $(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
117 > #libMPImdCode_a-ssd_FF.o: ssd_FF.F90 libMPImdCode_a-simulation_module.o \
118 > #       libMPImdCode_a-generic_atype_recombination.o libMPImdCode_a-atype_typedefs.o @fortran_machine_defs@  
119 > #       $(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
120  
121   libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a-simulation_module.o @fortran_machine_defs@
122          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-wrappers.o `test -f 'wrappers.F90' || echo '$(srcdir)/'`wrappers.F90
# Line 135 | Line 132 | mpiSimulation_module.o: mpiSimulation_module.F90 @fort
132          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o mpiSimulation_module.o `test -f 'mpiSimulation_module.F90' || echo '$(srcdir)/'`mpiSimulation_module.F90
133  
134  
138 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
139 – #       atype_typedefs.o
140 –
141 –

Diff Legend

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