--- trunk/OOPSE/libmdtools/Makefile.in	2004/06/02 18:27:52	1224
+++ trunk/OOPSE/libmdtools/Makefile.in	2004/06/04 03:15:31	1234
@@ -36,19 +36,16 @@ SPRNG_INC=@SPRNG_INC@
 
 # SPRNG include path
 SPRNG_INC=@SPRNG_INC@
+ 
+# Compile MPI code?
+USE_MPI=@USE_MPI@
+  
+# MPI include path
+MPI_INC_DIR=@MPI_INC_DIR@
 
-# MPICH library path
-MPI_LIBDIR=@MPI_LIBDIR@
+# MPI include path
+MPI_F90_INC=@MPI_F90_INC@
 
-# MPICH library
-MPI_LIB=@MPI_LIB@
-
-# MPICH include path
-MPI_INC=@MPI_INC@
-
-# MODDIRFLAG
-MODDIRFLAG=@MODDIRFLAG@
-
 # Compiler dependent Fortran module
 FLIBS_EXTRA = @F90LIBS@
 
@@ -124,18 +121,18 @@ MPI_INCLUDES= -I$(MPI_INC)
 # include paths starting with "." are all relative to the SUBDIRS!!!
 
 INCLUDES= -I.. -I../../libBASS $(SPRNG_INC)
-MPI_INCLUDES= -I$(MPI_INC)
-F90_INCLUDES= -I/usr/local/include
+MPI_INCLUDES= -I$(MPI_INC_DIR)
+MPI_F90_INCLUDES= -I$(MPI_F90_INC)
 
-CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP)
-CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
+CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) 
+CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE)
 FFLAGS=$(PREPFLAG) $(FFLAGS_C) 
-F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) $(F90_INCLUDES)
+F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) -I../../libBASS
 DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES)
 
 MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
 MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE)
-MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
+MPI_F90FLAGS=$(F90FLAGS) $(MPI_F90_INCLUDES) $(PREPDEFFLAG)$(MPI_DECLARE)
 
 SRC_DIR := ..
 
@@ -219,6 +216,14 @@ CXX_FILES = \
 	$(DIR)/ZConsReader.cpp \
 	$(DIR)/ZConstraint.cpp \
 	$(DIR)/ZconsVisitor.cpp \
+	$(DIR)/Restraints.cpp	\
+	$(DIR)/ConstraintManager.cpp \
+	$(DIR)/ConstraintAlgorithm.cpp \
+	$(DIR)/Shake.cpp \
+	$(DIR)/Rattle.cpp \
+	$(DIR)/ShakeMin.cpp \
+	$(DIR)/CallbackFunctor.cpp \
+	$(DIR)/ConstraintElement.cpp \
 	$(DIR)/ZConsWriter.cpp
 
 F90_FILES= \
@@ -268,7 +273,12 @@ all: libmdtools.a libmdtools_MPI.a
 
 # Possible make targets:
 
+ifeq ($(USE_MPI),yes)
 all: libmdtools.a libmdtools_MPI.a
+else
+all: libmdtools.a
+endif
+
 
 libmdtools.a: $(OBJS)
 	$(RM) $@