--- trunk/mdtools/md_code/Makefile	2002/09/24 22:10:55	117
+++ trunk/mdtools/md_code/Makefile	2002/10/03 20:12:15	126
@@ -1,18 +1,19 @@
+include ../Makefile.inc
 #CC_PLUS = /usr/local/bin/gcc
-CC_PLUS = icc
-LD = ld
-FC = ifc
+#CC_PLUS = icc
+#LD = ld
+#FC = ifc
 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
 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
-C_FLAGS = -mp -tpp6 -O3
+#F_LIBS =
+#CP_LIBS =
+FFLAGS = -mp -O3 -tpp6 
+#CFLAGS = -s -static -O3
+CFLAGS = -mp -tpp6 -O3
 
 LIBDIR = ../../../lib
 
@@ -22,71 +23,71 @@ f_longRange.o: f_longRange.f90
 	ar -crsv $@ $?
 
 f_longRange.o: f_longRange.f90
-	$(FC) $(F_FLAGS) -c f_longRange.f90
+	$(FC) $(FFLAGS) -c f_longRange.f90
 
 f_LJ.o: f_LJ.f90
-	$(FC) $(F_FLAGS) -c f_LJ.f90
+	$(FC) $(FFLAGS) -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
+	$(FC) $(FFLAGS) -c f_VDW.f90
 
 f_dipole.o: f_dipole.f90
-	$(FC) $(F_FLAGS) -c f_dipole.f90
+	$(FC) $(FFLAGS) -c f_dipole.f90
 
 f_reactionField.o: f_reactionField.f90
-	$(FC) $(F_FLAGS) -c f_reactionField.f90
+	$(FC) $(FFLAGS) -c f_reactionField.f90
 
 f_ssdForces.o: f_ssdForces.f90 f_ssd.inc
-	$(FC) $(F_FLAGS) -c f_ssdForces.f90
+	$(FC) $(FFLAGS) -c f_ssdForces.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
 
 clean: 
 	rm *.o *~ work.pcl work.pc