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 355 by mmeineke, Mon Mar 17 20:14:33 2003 UTC vs.
Revision 365 by mmeineke, Tue Mar 18 22:17:31 2003 UTC

# Line 31 | Line 31 | neighborLists.F90
31   atype_module.F90 f_verlet_constrained.f calc_dipole_dipole.F90      \
32   calc_reaction_field.F90 calc_LJ_FF.F90 calc_sticky_pair.F90         \
33   doForces.F90 vector_class.F90 simulation_module.F90 wrappers.F90    \
34 < neighborLists.F90
34 > neighborLists.F90 calc_gb.F90 force_globals.F90
35  
36   libmdCode_a_CXXFLAGS = -DFRC_PATH="$(pkgdatadir)" $(AM_CXXFLAGS)
37  
# Line 53 | Line 53 | calc_dipole_dipole.o: calc_dipole_dipole.F90 @fortran_
53  
54   neighborLists.o: neighborLists.F90 @fortran_machine_defs@
55  
56 < calc_dipole_dipole.o: calc_dipole_dipole.F90 @fortran_machine_defs@ simulation_module.o vector_class.o
56 > force_globals.o: @fortran_machine_defs@
57  
58 < calc_LJ_FF.o: calc_LJ_FF.F90 @fortran_machine_defs@ simulation_module.o vector_class.o atype_module.o
58 > calc_dipole_dipole.o: calc_dipole_dipole.F90 @fortran_machine_defs@ atype_module.o force_globals.o vector_class.o
59  
60 < calc_reaction_field.o: calc_reaction_field.F90 @fortran_machine_defs@ simulation_module.o vector_class.o atype_module.o
60 > calc_LJ_FF.o: calc_LJ_FF.F90 @fortran_machine_defs@ atype_module.o vector_class.o force_globals.o
61  
62 < calc_sticky_pair.o: calc_sticky_pair.F90 @fortran_machine_defs@ simulation_module.o
62 > calc_reaction_field.o: calc_reaction_field.F90 @fortran_machine_defs@ vector_class.o atype_module.o force_globals.o
63  
64 + calc_sticky_pair.o: calc_sticky_pair.F90 @fortran_machine_defs@ force_globals.o
65 +
66 + calc_gb.o: calc_gb.F90 @fortran_machine_defs@ force_globals.o
67 +
68   do_Forces.o: do_Forces.F90 @fortran_machine_defs@ simulation_module.o atype_module.o neighborLists.o calc_LJ_FF.o \
69 <        calc_sticky_pair.o calc_dipole_dipole.o calc_reaction_field.o
69 >        calc_sticky_pair.o calc_dipole_dipole.o calc_reaction_field.o calc_gb.o force_globals.o
70  
71   #*****************************************************************
72   # MPI build
# Line 101 | Line 105 | libMPImdCode_a-vector_class.$(OBJEXT)
105   libMPImdCode_a-calc_sticky_pair.$(OBJEXT)                            \
106   libMPImdCode_a-do_Forces.$(OBJEXT) \
107   libMPImdCode_a-wrappers.$(OBJEXT) \
108 + libMPImdCode_a-calc_gb.$(OBJEXT) \
109 + libMPImdCode_a-force_globals.$(OBJEXT) \
110   libMPImdCode_a-vector_class.$(OBJEXT)
111  
112   libMPImdCode_a_CFLAGS = -DIS_MPI $(AM_CFLAGS)
# Line 116 | Line 122 | libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a
122          libMPImdCode_a-atype_module.o libMPImdCode_a-neighborLists.o
123          $(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
124  
125 + libMPImdCode_a-force_globals.o: simulation_module.F90 @fortran_machine_defs@ mpiSimulation_module.o
126 +        $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-force_globals.o `test -f 'force_globals.F90' || echo '$(srcdir)/'`force_globals.F90
127 +
128   libMPImdCode_a-wrappers.o: wrappers.F90 libMPImdCode_a-simulation_module.o @fortran_machine_defs@ \
129          mpiSimulation_module.o libMPImdCode_a-do_Forces.o libMPImdCode_a-atype_module.o
130          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-wrappers.o `test -f 'wrappers.F90' || echo '$(srcdir)/'`wrappers.F90
# Line 127 | Line 136 | libMPImdCode_a-calc_dipole_dipole.o: calc_dipole_dipol
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
137  
138   libMPImdCode_a-calc_dipole_dipole.o: calc_dipole_dipole.F90 @fortran_machine_defs@ libMPImdCode_a-vector_class.o\
139 <        libMPImdCode_a-simulation_module.o mpiSimulation_module.o
139 >        libMPImdCode_a-force_globals.o mpiSimulation_module.o libMPImdCode_a-atype_module.o
140          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-calc_dipole_dipole.o `test -f 'calc_dipole_dipole.F90' || echo '$(srcdir)/'`calc_dipole_dipole.F90
141  
142   libMPImdCode_a-calc_LJ_FF.o: calc_LJ_FF.F90 @fortran_machine_defs@ libMPImdCode_a-vector_class.o\
143 <        libMPImdCode_a-simulation_module.o mpiSimulation_module.o libMPImdCode_a-atype_module.o
143 >        libMPImdCode_a-atype_module.o mpiSimulation_module.o libMPImdCode_a-force_globals.o
144          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-calc_LJ_FF.o `test -f 'calc_LJ_FF.F90' || echo '$(srcdir)/'`calc_LJ_FF.F90
145  
146   libMPImdCode_a-calc_reaction_field.o: calc_reaction_field.F90 @fortran_machine_defs@ libMPImdCode_a-vector_class.o\
147 <        libMPImdCode_a-simulation_module.o mpiSimulation_module.o libMPImdCode_a-atype_module.o
147 >        libMPImdCode_a-force_globals.o mpiSimulation_module.o libMPImdCode_a-atype_module.o
148          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-calc_reaction_field.o `test -f 'calc_reaction_field.F90' || echo '$(srcdir)/'`calc_reaction_field.F90
149  
150   libMPImdCode_a-calc_sticky_pair.o: calc_sticky_pair.F90 @fortran_machine_defs@ \
151 <        libMPImdCode_a-simulation_module.o mpiSimulation_module.o
151 >        libMPImdCode_a-force_globals.o mpiSimulation_module.o
152          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-calc_sticky_pair.o `test -f 'calc_sticky_pair.F90' || echo '$(srcdir)/'`calc_sticky_pair.F90
153  
154 + libMPImdCode_a-calc_gb.o: calc_gb.F90 @fortran_machine_defs@ \
155 +        libMPImdCode_a-force_globals.o mpiSimulation_module.o
156 +        $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-calc_gb.o `test -f 'calc_gb.F90' || echo '$(srcdir)/'`calc_gb.F90
157 +
158 +
159   libMPImdCode_a-do_Forces.o: do_Forces.F90 @fortran_machine_defs@ libMPImdCode_a-simulation_module.o mpiSimulation_module.o libMPImdCode_a-atype_module.o\
160          libMPImdCode_a-calc_sticky_pair.o libMPImdCode_a-calc_reaction_field.o libMPImdCode_a-calc_LJ_FF.o libMPImdCode_a-calc_dipole_dipole.o \
161 <        libMPImdCode_a-neighborLists.o
161 >        libMPImdCode_a-neighborLists.o libMPImdCode_a-calc_gb.o libMPImdCode_a-force_globals.o
162          $(F77) $(libMPImdCode_a_FFLAGS) $(FFLAGS) -I@mpich_include@/f90choice -c -o libMPImdCode_a-do_Forces.o `test -f 'do_Forces.F90' || echo '$(srcdir)/'`do_Forces.F90
163  
164   libMPImdCode_a-vector_class.o: vector_class.F90

Diff Legend

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