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 287 by mmeineke, Thu Feb 27 18:39:55 2003 UTC vs.
Revision 300 by mmeineke, Fri Mar 7 19:37:34 2003 UTC

# Line 18 | Line 18 | pkginclude_HEADERS = AbstractClasses.hpp Atom.hpp Forc
18  
19   pkglib_LIBRARIES = libmdCode.a libMPImdCode.a
20  
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 fSimulation.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 fSimulation.h fortranWrappers.hpp \
25 > fortranWrapDefines.hpp
26  
27 < libmdCode_a_SOURCES = forceFactory.hpp fortranFncs.h Bend.cpp        \
28 < BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp      \
29 < DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp  \
30 < SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp    \
31 < Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp       \
32 < Verlet.cpp randomSPRNG.cpp atype_typedefs.F90 f_verlet_constrained.f \
33 < generic_atype_recombination.F90 simulation_module.F90 lj_FF.F90      \
34 < wrappers.F90 forceFactory.F90 neighborLists.F90 ssd_FF.F90
27 > libmdCode_a_SOURCES = forceFactory.hpp fortranFncs.h Bend.cpp       \
28 > BendExtensions.cpp Bond.cpp BondExtensions.cpp DipoleTestFF.cpp     \
29 > DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
30 > SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp   \
31 > Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp      \
32 > Verlet.cpp randomSPRNG.cpp fortranWrappers.cpp ForceFields.cpp      \
33 > atype_typedefs.F90 f_verlet_constrained.f                           \
34 > generic_atype_recombination.F90 simulation_module.F90 lj_FF.F90     \
35 > wrappers.F90 forceFactory.F90 neighborLists.F90
36  
37 +
38 +
39   #compiler and machine dependent fortran definitions
40  
41   EXTRA_libmdCode_a_SOURCES = Linux_ifc_machdep.F90
42   libmdCode_a_LIBADD = @fortran_machine_defs@
43  
44  
45 < #ssd_FF.F90 TraPPE_ExFF_module.F90  
45 > #fortran module dependencies
46  
47   atype_typedefs.o: atype_typedefs.F90 @fortran_machine_defs@
48  
# Line 49 | Line 53 | ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulatio
53   lj_FF.o: lj_FF.F90  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
54          atype_typedefs.o
55  
56 < ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
57 <        atype_typedefs.o
56 > #ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
57 > #       atype_typedefs.o
58  
59   wrappers.o: wrappers.F90 simulation_module.o @fortran_machine_defs@
60  
# Line 58 | Line 62 | forceFactory.o: forceFactory.F90 lj_FF.o @fortran_mach
62  
63   forceFactory.o: forceFactory.F90 lj_FF.o @fortran_machine_defs@
64  
61 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
62 – #       atype_typedefs.o
65  
66  
67   #*****************************************************************
# Line 71 | Line 73 | Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f mpiF
73   DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
74   SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp   \
75   Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp      \
76 < Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f mpiForceField.c   \
77 < mpiSimulation.cpp mpiSimulation_module.F90
76 > fortranWrappers.cpp ForceFields.cpp Verlet.cpp randomSPRNG.cpp      \
77 > f_verlet_constrained.f mpiForceField.c mpiSimulation.cpp            \
78 > mpiSimulation_module.F90
79  
80   EXTRA_libMPImdCode_a_SOURCES = Linux_ifc_machdep.F90
81  
# Line 91 | Line 94 | libMPImdCode_a-ssd_FF.$(OBJEXT)                      
94   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
95   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
96   libMPImdCode_a-forceFactory.$(OBJEXT)                            \
97 < libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
97 > #libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
98   libMPImdCode_a-neighborLists.$(OBJEXT)
99  
100   libMPImdCode_a_CFLAGS = -DIS_MPI $(AM_CFLAGS)
101   libMPImdCode_a_CXXFLAGS =  -DIS_MPI $(AM_CXXFLAGS)
102   libMPImdCode_a_FFLAGS =  -DIS_MPI $(AM_FFLAGS)
103  
104 + #fortran module dependencies
105  
102 –
103 – #ssd_FF.F90 TraPPE_ExFF_module.F90  
104 –
106   libMPImdCode_a-atype_typedefs.o: atype_typedefs.F90 @fortran_machine_defs@
107          $(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
108  
# Line 116 | Line 117 | libMPImdCode_a-ssd_FF.o: ssd_FF.F90 libMPImdCode_a-sim
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
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
# Line 132 | Line 133 | mpiSimulation_module.o: mpiSimulation_module.F90 @fort
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
135 –        
136  
137 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
138 – #       atype_typedefs.o
137  
140 –

Diff Legend

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