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 285 by mmeineke, Wed Feb 26 18:45:57 2003 UTC vs.
Revision 321 by mmeineke, Wed Mar 12 15:12:24 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      \
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 + libmdCode_a_CXXFLAGS = -DFRC_PATH="$(pkgdatadir)" $(AM_CXXFLAGS)
38 +
39 +
40   #compiler and machine dependent fortran definitions
41  
42   EXTRA_libmdCode_a_SOURCES = Linux_ifc_machdep.F90
43   libmdCode_a_LIBADD = @fortran_machine_defs@
44  
45  
46 < #ssd_FF.F90 TraPPE_ExFF_module.F90  
46 > #fortran module dependencies
47  
48   atype_typedefs.o: atype_typedefs.F90 @fortran_machine_defs@
49  
# Line 49 | Line 54 | wrappers.o: wrappers.F90 simulation_module.o @fortran_
54   lj_FF.o: lj_FF.F90  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
55          atype_typedefs.o
56  
57 + #ssd_FF.o: ssd_FF.F89  @fortran_machine_defs@ simulation_module.o generic_atype_recombination.o \
58 + #       atype_typedefs.o
59 +
60   wrappers.o: wrappers.F90 simulation_module.o @fortran_machine_defs@
61  
62   neighborLists.o: neighborLists.F90 simulation_module.o @fortran_machine_defs@
63  
64   forceFactory.o: forceFactory.F90 lj_FF.o @fortran_machine_defs@
65  
58 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
59 – #       atype_typedefs.o
66  
67  
68   #*****************************************************************
# Line 68 | Line 74 | Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f mpiF
74   DirectionalAtom.cpp DumpWriter.cpp InitializeFromFile.cpp LJ_FF.cpp \
75   SimInfo.cpp SimSetup.cpp StatWriter.cpp Symplectic.cpp Thermo.cpp   \
76   Torsion.cpp TorsionExtensions.cpp TraPPE_ExFF.cpp TraPPEFF.cpp      \
77 < Verlet.cpp randomSPRNG.cpp f_verlet_constrained.f mpiForceField.c   \
78 < mpiSimulation.cpp mpiSimulation_module.F90
77 > fortranWrappers.cpp ForceFields.cpp Verlet.cpp randomSPRNG.cpp      \
78 > f_verlet_constrained.f mpiForceField.c mpiSimulation.cpp            \
79 > mpiSimulation_module.F90
80  
81   EXTRA_libMPImdCode_a_SOURCES = Linux_ifc_machdep.F90
82  
# Line 79 | Line 86 | libMPImdCode_a-neighborLists.$(OBJEXT)
86   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
87   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
88   libMPImdCode_a-forceFactory.$(OBJEXT)                            \
89 + libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
90   libMPImdCode_a-neighborLists.$(OBJEXT)
91  
92   libMPImdCode_a_DEPENDENCIES = @fortran_machine_defs@             \
# Line 87 | Line 95 | libMPImdCode_a-neighborLists.$(OBJEXT)
95   libMPImdCode_a-simulation_module.$(OBJEXT)                       \
96   libMPImdCode_a-lj_FF.$(OBJEXT) libMPImdCode_a-wrappers.$(OBJEXT) \
97   libMPImdCode_a-forceFactory.$(OBJEXT)                            \
98 + #libMPImdCode_a-ssd_FF.$(OBJEXT)                                  \
99   libMPImdCode_a-neighborLists.$(OBJEXT)
100  
101   libMPImdCode_a_CFLAGS = -DIS_MPI $(AM_CFLAGS)
102 < libMPImdCode_a_CXXFLAGS =  -DIS_MPI $(AM_CXXFLAGS)
102 > libMPImdCode_a_CXXFLAGS = -DFRC_PATH="$(pkgdatadir)" -DIS_MPI $(AM_CXXFLAGS)
103   libMPImdCode_a_FFLAGS =  -DIS_MPI $(AM_FFLAGS)
104  
105 + #fortran module dependencies
106  
97 –
98 – #ssd_FF.F90 TraPPE_ExFF_module.F90  
99 –
107   libMPImdCode_a-atype_typedefs.o: atype_typedefs.F90 @fortran_machine_defs@
108          $(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
109  
# Line 111 | Line 118 | libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a
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-lj_FF.o `test -f 'lj_FF.F90' || echo '$(srcdir)/'`lj_FF.F90
120  
121 + #libMPImdCode_a-ssd_FF.o: ssd_FF.F90 libMPImdCode_a-simulation_module.o \
122 + #       libMPImdCode_a-generic_atype_recombination.o libMPImdCode_a-atype_typedefs.o @fortran_machine_defs@  
123 + #       $(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
124 +
125   libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a-simulation_module.o @fortran_machine_defs@
126          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-wrappers.o `test -f 'wrappers.F90' || echo '$(srcdir)/'`wrappers.F90
127  
# Line 123 | Line 134 | mpiSimulation_module.o: mpiSimulation_module.F90 @fort
134  
135   mpiSimulation_module.o: mpiSimulation_module.F90 @fortran_machine_defs@
136          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o mpiSimulation_module.o `test -f 'mpiSimulation_module.F90' || echo '$(srcdir)/'`mpiSimulation_module.F90
126 –        
137  
128 – #ssd_FF.o: ssd_FF.F90 simulation_module.o generic_atype_recombination.o \
129 – #       atype_typedefs.o
138  
131 –

Diff Legend

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