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 277 by mmeineke, Wed Feb 19 21:09:33 2003 UTC vs.
Revision 291 by mmeineke, Wed Mar 5 20:35:54 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      \
# Line 30 | Line 30 | wrappers.F90 forceFactory.F90
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
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 49 | Line 51 | wrappers.o: wrappers.F90 simulation_module.o @fortran_
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
56 +
57   wrappers.o: wrappers.F90 simulation_module.o @fortran_machine_defs@
58  
59 + neighborLists.o: neighborLists.F90 simulation_module.o @fortran_machine_defs@
60 +
61   forceFactory.o: forceFactory.F90 lj_FF.o @fortran_machine_defs@
62  
56 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
57 – #       atype_typedefs.o
63  
64  
65   #*****************************************************************
# Line 76 | Line 81 | libMPImdCode_a-forceFactory.$(OBJEXT)
81   libMPImdCode_a-generic_atype_recombination.$(OBJEXT)             \
82   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
83   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
84 < libMPImdCode_a-forceFactory.$(OBJEXT)
84 > libMPImdCode_a-forceFactory.$(OBJEXT)                            \
85 > libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
86 > libMPImdCode_a-neighborLists.$(OBJEXT)
87  
88   libMPImdCode_a_DEPENDENCIES = @fortran_machine_defs@             \
89   libMPImdCode_a-atype_typedefs.$(OBJEXT)                          \
90   libMPImdCode_a-generic_atype_recombination.$(OBJEXT)             \
91   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
92   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
93 < libMPImdCode_a-forceFactory.$(OBJEXT)
93 > libMPImdCode_a-forceFactory.$(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  
93 –
94 – #ssd_FF.F90 TraPPE_ExFF_module.F90  
95 –
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 100 | Line 107 | libMPImdCode_a-simulation_module.o: simulation_module.
107          libMPImdCode_a-atype_typedefs.o  @fortran_machine_defs@  
108          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-generic_atype_recombination.o `test -f 'generic_atype_recombination.F90' || echo '$(srcdir)/'`generic_atype_recombination.F90
109  
110 < libMPImdCode_a-simulation_module.o: simulation_module.F90 @fortran_machine_defs@
110 > libMPImdCode_a-simulation_module.o: simulation_module.F90 @fortran_machine_defs@ mpiSimulation_module.o
111          $(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
112  
113   libMPImdCode_a-lj_FF.o: lj_FF.F90 libMPImdCode_a-simulation_module.o \
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
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
123  
124 + libMPImdCode_a-neighborLists.o: neighborLists.F90 mpiSimulation_module.o \
125 +        libMPImdCode_a-simulation_module.o @fortran_machine_defs@
126 +        $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-neighborLists.o `test -f 'neighborLists.F90' || echo '$(srcdir)/'`neighborLists.F90
127 +
128   libMPImdCode_a-forceFactory.o: forceFactory.F90 libMPImdCode_a-lj_FF.o @fortran_machine_defs@
129          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-forceFactory.o `test -f 'forceFactory.F90' || echo '$(srcdir)/'`forceFactory.F90
130  
131 < mpiSimulation_module.o: mpiSimulation_module.F90 libMPImdCode_a-lj_FF.o @fortran_machine_defs@
131 > mpiSimulation_module.o: mpiSimulation_module.F90 @fortran_machine_defs@
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
118 –        
133  
120 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
121 – #       atype_typedefs.o
134  
123 –

Diff Legend

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