--- trunk/mdtools/mpi_implementation/Makefile	2002/11/14 22:00:44	176
+++ trunk/mdtools/mpi_implementation/Makefile	2003/01/30 15:20:21	253
@@ -1,32 +1,25 @@ include ../Makefile.inc
 include ../Makefile.inc
-#CC_PLUS = /usr/local/bin/gcc
-#CC_PLUS = icc
-#LD = ld
-#FC = ifc
+
 INCLUDE = ../headers
 CP_OBJ = mpiBASS.o mpiSimulation.o mpiForceField.o
-#CFLAGS = -s -static -O3
-#CFLAGS = -mp -tpp6 -O3
+F_OBJ = mpiSimulation_module.o
 
-#LIBDIR = ../lib
+all: $(LIBDIR)/$(LIBNAME)
 
-
-GLOBAL_DEPENDS = $(INCLUDE)/mpiBASS.h
-
-all: $(LIBDIR)/libmdtools.a
-
-$(LIBDIR)/libmdtools.a: $(CP_OBJ)
+$(LIBDIR)/$(LIBNAME): $(CP_OBJ) $(F_OBJ)
 	ar -crsv $@ $?
 
-
-mpiBASS.o: $(GLOBAL_DEPENDS) mpiBASS.c
+mpiBASS.o: $(INCLUDE)/mpiBASS.h mpiBASS.c
 	$(CC) $(CFLAGS) -I$(INCLUDE) -c mpiBASS.c
 
-mpiForceField.o: $(GLOBAL_DEPENDS) mpiForceField.c
+mpiForceField.o: $(INCLUDE)/mpiForceField.h mpiForceField.c
 	$(CC) $(CFLAGS) -I$(INCLUDE) -c mpiForceField.c
 
 mpiSimulation.o: $(INCLUDE)/mpiSimulation.hpp mpiSimulation.cpp
 	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c mpiSimulation.cpp
 
+mpiSimulation_module.o: mpiSimulation_module.F90
+	$(FC) $(FFLAGS) -I$(INCLUDE) -c mpiSimulation_module.F90
+
 clean: 
 	rm *.o *~