--- trunk/mdtools/interface_implementation/Makefile	2002/10/09 22:29:40	131
+++ trunk/mdtools/interface_implementation/Makefile	2003/01/30 20:03:37	254
@@ -1,16 +1,11 @@
 include ../Makefile.inc
-#CC_PLUS = /usr/local/bin/gcc
-#CC_PLUS = icc
-#LD = ld
-#FC = ifc
+
 INCLUDE = ../headers
 CP_OBJ = BASS_interface.o MakeStamps.o LinkedAssign.o Component.o Globals.o\
 	LinkedCommand.o SimSetup.o TraPPEFF.o DipoleTestFF.o TraPPE_ExFF.o\
-	bassDiag.o
-#CFLAGS = -s -static -O3
-#CFLAGS = -mp -tpp6 -O3
+	bassDiag.o simError.o LJ_FF.o
 
-LIBDIR = ../lib
+F_OBJ = forceFactory.o
 
 MCL_DEPENDS = $(INCLUDE)/BASS_interface.h $(INCLUDE)/MakeStamps.hpp \
 	$(INCLUDE)/Globals.hpp ./BASS_interface.cpp
@@ -23,11 +18,14 @@ all: $(LIBDIR)/libmdtools.a
 GLOBAL_DEPENDS = $(INCLUDE)/BASS_interface.h $(INCLUDE)/Globals.hpp\
 	$(INCLUDE)/MakeStamps.hpp $(INCLUDE)/LinkedCommand.hpp ./Globals.cpp
 
-all: $(LIBDIR)/libmdtools.a
+all: $(LIBDIR)/$(LIBNAME)
 
-$(LIBDIR)/libmdtools.a: $(CP_OBJ)
+$(LIBDIR)/$(LIBNAME): $(CP_OBJ) $(F_OBJ)
 	ar -crsv $@ $?
 
+forceFactory.o: forceFactory.F90
+	$(FC) $(FFLAGS) -I$(INCLUDE) -I../md_code -c forceFactory.F90
+
 BASS_interface.o: $(MCL_DEPENDS)
 	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c BASS_interface.cpp
 
@@ -61,7 +59,11 @@ bassDiag.o: $(INCLUDE)/bassDiag.hpp ./bassDiag.cpp
 bassDiag.o: $(INCLUDE)/bassDiag.hpp ./bassDiag.cpp
 	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c bassDiag.cpp
 
+simError.o: $(INCLUDE)/simError.h ./simError.c
+	$(CC) $(CFLAGS) -I$(INCLUDE) -c simError.c
 
+LJ_FF.o: $(INCLUDE)/ForceFields.hpp ./LJ_FF.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c LJ_FF.cpp
 
 clean: 
 	rm *.o *~