--- trunk/mdtools/md_code/Makefile	2003/01/27 21:28:19	249
+++ trunk/mdtools/md_code/Makefile	2003/01/30 20:03:37	254
@@ -1,14 +1,17 @@
 include ../Makefile.inc
 
 INCLUDE = ../headers
-F_OBJ = Linux_ifc_machdef.o atype_typedefs.o generic_atype_recombination.o \
+F_OBJ = 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\
-	SimInfo.o
+	SimInfo.o randomSPRNG.o
 
+FFLAGS += -I../mpi_implementation/
+
+
 all: $(LIBDIR)/$(LIBNAME)
 
 $(LIBDIR)/$(LIBNAME): $(F_OBJ) $(CP_OBJ)
@@ -18,21 +21,17 @@ f_verlet_constrained.o: f_verlet_constrained.f
 f_verlet_constrained.o: f_verlet_constrained.f
 	$(FC) $(FFLAGS) -c f_verlet_constrained.f
 
-
-Linux_ifc_machdef.o: Linux_ifc_machdep.F90
-	$(FC) $(FFLAGS) -c  Linux_ifc_machdep.F90
-
-atype_typedefs.o: atype_typedefs.F90 Linux_ifc_machdef.o
+atype_typedefs.o: atype_typedefs.F90 
 	$(FC) $(FFLAGS) -c  atype_typedefs.F90
 
-generic_atype_recombination.o: generic_atype_recombination.F90 Linux_ifc_machdef.o atype_typedefs.o
+generic_atype_recombination.o: generic_atype_recombination.F90 atype_typedefs.o
 	$(FC) $(FFLAGS) -c  generic_atype_recombination.F90
 
-simulation_module.o:simulation_module.F90 Linux_ifc_machdef.o 
+simulation_module.o:simulation_module.F90 
 	$(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
+	atype_typedefs.o 
 	$(FC) $(FFLAGS) -c  lj_FF.F90
 
 wrappers.o: wrappers.F90 simulation_module.o 
@@ -87,5 +86,10 @@ clean: 
 SimInfo.o: $(INCLUDE)/SimInfo.hpp SimInfo.cpp
 	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c SimInfo.cpp
 
+randomSPRNG.o: $(INCLUDE)/randomSPRNG.hpp randomSPRNG.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c randomSPRNG.cpp
+
+f90_include:
+	cp *.mod ../f90_include
 clean: 
-	rm *.o *~ work.pcl work.pc
+	rm *.o *~ *.mod