--- trunk/OOPSE/libmdtools/Makefile.in	2003/09/25 16:42:34	785
+++ trunk/OOPSE/libmdtools/Makefile.in	2003/11/07 21:46:56	858
@@ -46,6 +46,9 @@ MPI_INC=@MPI_INC@
 # MPICH include path
 MPI_INC=@MPI_INC@
 
+# MODDIRFLAG
+MODDIRFLAG=@MODDIRFLAG@
+
 # MPI F90 Module path
 MPI_F90_MODS=@MPI_F90_MODS@
 
@@ -95,6 +98,12 @@ CXXFLAGS_C=@CXXFLAGS@
 # C++ flags
 CXXFLAGS_C=@CXXFLAGS@
 
+# C++ template flags
+OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
+
+# C++ namespace flags
+EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
+
 # Preprocessor flag for fortran
 PREPFLAG=@PREPFLAG@
 
@@ -118,19 +127,20 @@ MPI_INCLUDES= -I$(MPI_INC) $(MPI_F90_MODS)
 # include paths starting with "." are all relative to the SUBDIRS!!!
 
 INCLUDES= -I.. -I../../libBASS $(SPRNG_INC)
-MPI_INCLUDES= -I$(MPI_INC) $(MPI_F90_MODS)
+MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS)
+F90_INCLUDES= -I/usr/local/include
 
 CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP)
-CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
+CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP)
 FFLAGS=$(PREPFLAG) $(FFLAGS_C) 
-F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) 
+F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) $(F90_INCLUDES)
 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)
 
-SRC_DIR := $(PWD)
+SRC_DIR := ..
 
 # Then do the compile rules:
 
@@ -166,6 +176,7 @@ CXX_FILES = \
 	$(DIR)/BondExtensions.cpp \
 	$(DIR)/DirectionalAtom.cpp \
 	$(DIR)/DumpWriter.cpp \
+	$(DIR)/DumpReader.cpp \
 	$(DIR)/Exclude.cpp \
 	$(DIR)/InitializeFromFile.cpp \
 	$(DIR)/LJFF.cpp \
@@ -186,8 +197,7 @@ CXX_FILES = \
 	$(DIR)/Molecule.cpp \
 	$(DIR)/NPTf.cpp \
 	$(DIR)/NPTi.cpp \
-	$(DIR)/NPTxym.cpp \
-	$(DIR)/NPTzm.cpp \
+	$(DIR)/NPTxyz.cpp \
 	$(DIR)/NVT.cpp \
 	$(DIR)/SimState.cpp \
 	$(DIR)/ZConstraint.cpp \
@@ -211,7 +221,8 @@ F90_FILES= \
 	$(DIR)/calc_gb.F90 \
 	$(DIR)/force_globals.F90 \
 	$(DIR)/mpiSimulation_module.F90 \
-	$(DIR)/notifyCutoffs.F90
+	$(DIR)/notifyCutoffs.F90 \
+	$(DIR)/oopseMPI_module.F90
 
 DIR:=.
 C_SRCS   :=     $(C_FILES)
@@ -395,7 +406,10 @@ MPIobj/mpiSimulation_module$(O): ./mpiSimulation_modul
 
 MPIobj/status_module$(O): ./status_module.F90
 
-MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90
+MPIobj/oopseMPI_module$(O): ./oopseMPI_module.F90
+
+MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90 \
+	MPIobj/oopseMPI_module$(O)
 
 MPIobj/force_globals$(O): ./force_globals.F90 \
 	MPIobj/mpiSimulation_module$(O) \