--- trunk/OOPSE/libmdtools/Makefile	2003/07/16 21:30:56	626
+++ trunk/OOPSE/libmdtools/Makefile	2003/07/17 19:25:51	631
@@ -22,7 +22,7 @@ FFLAGS=$(FFLAGS_C) $(DECLARES)
 
 CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES) $(MPI_INCLUDES)
 CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
-FFLAGS=$(FFLAGS_C) $(DECLARES)
+FFLAGS=$(FFLAGS_C) 
 DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS -I$(SPRNG_INC) $(MPI_INCLUDES)
 
 MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
@@ -53,7 +53,9 @@ C_FILES = $(DIR)/mpiForceField.c
 
 # Then list what we have to compile
 
-C_FILES = $(DIR)/mpiForceField.c
+C_FILES = \
+	$(DIR)/mpiForceField.c \
+	$(DIR)/fInfo.c
 
 CXX_FILES = \
 	$(DIR)/Atom.cpp \
@@ -66,6 +68,7 @@ CXX_FILES = \
 	$(DIR)/Exclude.cpp \
 	$(DIR)/InitializeFromFile.cpp \
 	$(DIR)/LJFF.cpp \
+	$(DIR)/EAM_FF.cpp \
 	$(DIR)/SimInfo.cpp \
 	$(DIR)/SimSetup.cpp \
 	$(DIR)/StatWriter.cpp \
@@ -89,10 +92,12 @@ F90_FILES= \
 
 F90_FILES= \
 	$(DIR)/Linux_ifc_machdep.F90 \
+	$(DIR)/status_module.F90 \
 	$(DIR)/atype_module.F90 \
 	$(DIR)/calc_dipole_dipole.F90 \
 	$(DIR)/calc_reaction_field.F90 \
 	$(DIR)/calc_LJ_FF.F90 \
+	$(DIR)/calc_eam.F90 \
 	$(DIR)/calc_sticky_pair.F90 \
 	$(DIR)/do_Forces.F90 \
 	$(DIR)/vector_class.F90 \
@@ -182,6 +187,8 @@ obj/force_globals$(O): ./force_globals.F90 \
 
 obj/vector_class$(O): ./vector_class.F90
 
+obj/status_module$(O): ./status_module.F90
+
 obj/force_globals$(O): ./force_globals.F90 \
 	obj/$(F_MACH_DEFS)
 
@@ -192,6 +199,14 @@ obj/calc_sticky_pair$(O): ./calc_sticky_pair.F90 \
 	obj/$(F_MACH_DEFS) \
 	obj/simulation_module$(O) \
 	obj/force_globals$(O)
+
+obj/calc_eam$(O): ./calc_eam.F90 \
+	obj/$(F_MACH_DEFS) \
+	obj/atype_module$(O) \
+	obj/simulation_module$(O) \
+	obj/vector_class$(O) \
+	obj/force_globals$(O) \
+	obj/status_module$(O)
 
 obj/calc_gb$(O): ./calc_gb.F90 \
 	obj/$(F_MACH_DEFS) \
@@ -271,6 +286,8 @@ MPIobj/mpiSimulation_module$(O): ./mpiSimulation_modul
 
 MPIobj/vector_class$(O): ./vector_class.F90
 
+MPIobj/status_module$(O): ./status_module.F90
+
 MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90
 
 MPIobj/force_globals$(O): ./force_globals.F90 \
@@ -293,6 +310,15 @@ MPIobj/atype_module$(O): ./atype_module.F90 \
 	MPIobj/mpiSimulation_module$(O) \
 	MPIobj/force_globals$(O)
 
+MPIobj/calc_eam$(O): ./calc_eam.F90 \
+	MPIobj/$(F_MACH_DEFS) \
+	MPIobj/atype_module$(O) \
+	MPIobj/simulation_module$(O) \
+	MPIobj/vector_class$(O) \
+	MPIobj/force_globals$(O) \
+	MPIobj/status_module$(O)
+
+
 MPIobj/atype_module$(O): ./atype_module.F90 \
 	MPIobj/$(F_MACH_DEFS) \
 	MPIobj/vector_class$(O)