--- trunk/mdtools/md_code/Makefile	2003/01/27 19:28:21	248
+++ trunk/mdtools/md_code/Makefile	2003/01/27 21:28:19	249
@@ -1,38 +1,43 @@
 include ../Makefile.inc
 
 INCLUDE = ../headers
-F_OBJ = f_VDW.o f_verlet_constrained.o f_LJ.o f_longRange.o f_dipole.o \
-	f_reactionField.o f_ssdForces.o
+F_OBJ = Linux_ifc_machdef.o atype_typedefs.o generic_atype_recombination.o \
+	simulation_module.o lj_FF.o wrappers.o f_verlet_constrained.o
+
 CP_OBJ = Bend.o Torsion.o Bond.o Verlet.o InitializeFromFile.o \
 	BondExtensions.o BendExtensions.o TorsionExtensions.o Thermo.o \
-	DirectionalAtom.o AllLong.o DumpWriter.o StatWriter.o Symplectic.o
+	DirectionalAtom.o AllLong.o DumpWriter.o StatWriter.o Symplectic.o\
+	SimInfo.o
 
 all: $(LIBDIR)/$(LIBNAME)
 
 $(LIBDIR)/$(LIBNAME): $(F_OBJ) $(CP_OBJ)
 	ar -crsv $@ $?
 
-f_longRange.o: f_longRange.f90
-	$(FC) $(FFLAGS) -c f_longRange.f90
 
-f_LJ.o: f_LJ.f90
-	$(FC) $(FFLAGS) -c f_LJ.f90
-
 f_verlet_constrained.o: f_verlet_constrained.f
 	$(FC) $(FFLAGS) -c f_verlet_constrained.f
 
-f_VDW.o: f_VDW.f90
-	$(FC) $(FFLAGS) -c f_VDW.f90
 
-f_dipole.o: f_dipole.f90
-	$(FC) $(FFLAGS) -c f_dipole.f90
+Linux_ifc_machdef.o: Linux_ifc_machdep.F90
+	$(FC) $(FFLAGS) -c  Linux_ifc_machdep.F90
 
-f_reactionField.o: f_reactionField.f90
-	$(FC) $(FFLAGS) -c f_reactionField.f90
+atype_typedefs.o: atype_typedefs.F90 Linux_ifc_machdef.o
+	$(FC) $(FFLAGS) -c  atype_typedefs.F90
 
-f_ssdForces.o: f_ssdForces.f90 f_ssd.inc
-	$(FC) $(FFLAGS) -c f_ssdForces.f90
+generic_atype_recombination.o: generic_atype_recombination.F90 Linux_ifc_machdef.o atype_typedefs.o
+	$(FC) $(FFLAGS) -c  generic_atype_recombination.F90
 
+simulation_module.o:simulation_module.F90 Linux_ifc_machdef.o 
+	$(FC) $(FFLAGS) -c  simulation_module.F90
+
+lj_FF.o: lj_FF.F90 simulation_module.o generic_atype_recombination.o \
+	atype_typedefs.o Linux_ifc_machdef.o
+	$(FC) $(FFLAGS) -c  lj_FF.F90
+
+wrappers.o: wrappers.F90 simulation_module.o 
+	$(FC) $(FFLAGS) -c wrappers.F90
+
 Verlet.o: $(INCLUDE)/Integrator.hpp $(INCLUDE)/Atom.hpp \
 	$(INCLUDE)/SimInfo.hpp $(INCLUDE)/AbstractClasses.hpp Verlet.cpp
 	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Verlet.cpp
@@ -79,5 +84,8 @@ clean: 
 Symplectic.o: $(INCLUDE)/Integrator.hpp Symplectic.cpp
 	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Symplectic.cpp
 
+SimInfo.o: $(INCLUDE)/SimInfo.hpp SimInfo.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c SimInfo.cpp
+
 clean: 
 	rm *.o *~ work.pcl work.pc