--- trunk/mdtools/md_code/Makefile	2002/07/09 18:40:59	11
+++ trunk/mdtools/md_code/Makefile	2003/01/27 22:12:57	250
@@ -1,90 +1,94 @@
-CC_PLUS = /usr/local/bin/gcc
-LD = ld
-FC = ifc
+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
-F_LIBS =
-CP_LIBS =
-F_FLAGS = -mp -O3 -tpp6 
-C_FLAGS = -s -static -O3
+	DirectionalAtom.o AllLong.o DumpWriter.o StatWriter.o Symplectic.o\
+	SimInfo.o randomSPRNG.o
 
-LIBDIR = ../../../lib
+all: $(LIBDIR)/$(LIBNAME)
 
-all: $(LIBDIR)/libmdtools.a
-
-$(LIBDIR)/libmdtools.a: $(F_OBJ) $(CP_OBJ)
+$(LIBDIR)/$(LIBNAME): $(F_OBJ) $(CP_OBJ)
 	ar -crsv $@ $?
 
-f_longRange.o: f_longRange.f90
-	$(FC) $(F_FLAGS) -c f_longRange.f90
 
-f_LJ.o: f_LJ.f90
-	$(FC) $(F_FLAGS) -c f_LJ.f90
-
 f_verlet_constrained.o: f_verlet_constrained.f
-	$(FC) $(F_FLAGS) -c f_verlet_constrained.f
+	$(FC) $(FFLAGS) -c f_verlet_constrained.f
 
-f_VDW.o: f_VDW.f90
-	$(FC) $(F_FLAGS) -c f_VDW.f90
 
-f_dipole.o: f_dipole.f90
-	$(FC) $(F_FLAGS) -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) $(F_FLAGS) -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) $(F_FLAGS) -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) $(C_FLAGS) -I$(INCLUDE) -c Verlet.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Verlet.cpp
 
 AllLong.o: $(INCLUDE)/LRI.hpp $(INCLUDE)/Atom.hpp $(INCLUDE)/SimInfo.hpp \
 	$(INCLUDE)/AbstractClasses.hpp AllLong.cpp	
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c AllLong.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c AllLong.cpp
 
 Bond.o : $(INCLUDE)/SRI.hpp $(INCLUDE)/Atom.hpp Bond.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c Bond.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Bond.cpp
 
 Bend.o : $(INCLUDE)/SRI.hpp $(INCLUDE)/Atom.hpp Bend.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c Bend.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Bend.cpp
 
 Torsion.o : $(INCLUDE)/SRI.hpp $(INCLUDE)/Atom.hpp Torsion.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c Torsion.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Torsion.cpp
 
 InitializeFromFile.o: $(INCLUDE)/ReadWrite.hpp $(INCLUDE)/Atom.hpp \
 	InitializeFromFile.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c InitializeFromFile.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c InitializeFromFile.cpp
 
 DumpWriter.o: $(INCLUDE)/ReadWrite.hpp DumpWriter.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c DumpWriter.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c DumpWriter.cpp
 
 StatWriter.o: $(INCLUDE)/ReadWrite.hpp StatWriter.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c StatWriter.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c StatWriter.cpp
 
 BondExtensions.o : $(INCLUDE)/SRI.hpp $(INCLUDE)/Atom.hpp BondExtensions.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c BondExtensions.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c BondExtensions.cpp
 
 BendExtensions.o : $(INCLUDE)/SRI.hpp $(INCLUDE)/Atom.hpp BendExtensions.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c BendExtensions.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c BendExtensions.cpp
 
 TorsionExtensions.o : $(INCLUDE)/SRI.hpp $(INCLUDE)/Atom.hpp \
 	TorsionExtensions.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c TorsionExtensions.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c TorsionExtensions.cpp
 
 Thermo.o: $(INCLUDE)/Thermo.hpp Thermo.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c Thermo.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Thermo.cpp
 
 DirectionalAtom.o: $(INCLUDE)/Atom.hpp DirectionalAtom.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c DirectionalAtom.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c DirectionalAtom.cpp
 
 Symplectic.o: $(INCLUDE)/Integrator.hpp Symplectic.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c 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
+
+randomSPRNG.o: $(INCLUDE)/randomSPRNG.hpp randomSPRNG.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c randomSPRNG.cpp
+
 clean: 
 	rm *.o *~ work.pcl work.pc