--- branches/mmeineke/mdtools/interface_implementation/Makefile	2002/07/09 18:40:59	10
+++ trunk/mdtools/interface_implementation/Makefile	2003/01/30 20:03:37	254
@@ -1,12 +1,11 @@
-CC_PLUS = /usr/local/bin/gcc
-LD = ld
-FC = ifc
+include ../Makefile.inc
+
 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
-C_FLAGS = -s -static -O3
+	LinkedCommand.o SimSetup.o TraPPEFF.o DipoleTestFF.o TraPPE_ExFF.o\
+	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
@@ -19,40 +18,52 @@ 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) $(C_FLAGS) -I$(INCLUDE) -c BASS_interface.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c BASS_interface.cpp
 
 MakeStamps.o: $(MAKESTAMPS_DEPENDS)
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c MakeStamps.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c MakeStamps.cpp
 
 LinkedAssign.o: ./LinkedAssign.cpp $(INCLUDE)/LinkedAssign.hpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c LinkedAssign.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c LinkedAssign.cpp
 
 LinkedCommand.o: ./LinkedCommand.cpp $(INCLUDE)/LinkedCommand.hpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c LinkedCommand.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c LinkedCommand.cpp
 
 Component.o: ./Component.cpp $(INCLUDE)/Component.hpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c Component.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Component.cpp
 
 Globals.o: $(GLOBAL_DEPENDS)
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c Globals.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c Globals.cpp
 
 SimSetup.o: $(INCLUDE)/SimSetup.hpp ./SimSetup.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c SimSetup.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c SimSetup.cpp
 
 TraPPEFF.o: $(INCLUDE)/ForceFields.hpp ./TraPPEFF.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c TraPPEFF.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c TraPPEFF.cpp
 
 DipoleTestFF.o: $(INCLUDE)/ForceFields.hpp ./DipoleTestFF.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c DipoleTestFF.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c DipoleTestFF.cpp
 
 TraPPE_ExFF.o: $(INCLUDE)/ForceFields.hpp ./TraPPE_ExFF.cpp
-	$(CC_PLUS) $(C_FLAGS) -I$(INCLUDE) -c TraPPE_ExFF.cpp
+	$(CC_PLUS) $(CFLAGS) -I$(INCLUDE) -c TraPPE_ExFF.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 *~