--- trunk/OOPSE/libmdtools/Makefile.in	2003/09/12 16:20:16	761
+++ trunk/OOPSE/libmdtools/Makefile.in	2003/11/06 19:11:38	853
@@ -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@
 
@@ -102,8 +111,11 @@ FFLAGS_C=@F90FLAGS@
 PREPDEFFLAG=@PREPDEFFLAG@
 
 # Fortran flags
-FFLAGS_C=@F90FLAGS@
+FFLAGS_C=@FFLAGS@
 
+# Fortran90 flags
+F90FLAGS_C=@F90FLAGS@
+
 # LDFLAGS
 LDFLAGS=@LDFLAGS@
 
@@ -115,26 +127,27 @@ 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)
 
 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) 
 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_FFLAGS=$(FFLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
+MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES)
 
-SRC_DIR := $(PWD)
+SRC_DIR := ..
 
 # Then do the compile rules:
 
 obj/%.o: %.F90
-	cd obj; $(F90) $(FFLAGS) -c  $(SRC_DIR)/$<
+	cd obj; $(F90) $(F90FLAGS) -c  $(SRC_DIR)/$<
 
 MPIobj/%.o: %.F90
-	cd MPIobj; $(F90) $(MPI_FFLAGS) -c $(SRC_DIR)/$<
+	cd MPIobj; $(F90) $(MPI_F90FLAGS) -c $(SRC_DIR)/$<
 
 obj/%.o: %.cpp
 	cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
@@ -162,6 +175,7 @@ CXX_FILES = \
 	$(DIR)/BondExtensions.cpp \
 	$(DIR)/DirectionalAtom.cpp \
 	$(DIR)/DumpWriter.cpp \
+	$(DIR)/DumpReader.cpp \
 	$(DIR)/Exclude.cpp \
 	$(DIR)/InitializeFromFile.cpp \
 	$(DIR)/LJFF.cpp \
@@ -180,13 +194,11 @@ CXX_FILES = \
 	$(DIR)/ForceFields.cpp \
 	$(DIR)/mpiSimulation.cpp \
 	$(DIR)/Molecule.cpp \
+	$(DIR)/NPT.cpp \
 	$(DIR)/NPTf.cpp \
 	$(DIR)/NPTi.cpp \
-	$(DIR)/NPTim.cpp \
-	$(DIR)/NPTxym.cpp \
-	$(DIR)/NPTzm.cpp \
+	$(DIR)/NPTxyz.cpp \
 	$(DIR)/NVT.cpp \
-	$(DIR)/NPTfm.cpp \
 	$(DIR)/SimState.cpp \
 	$(DIR)/ZConstraint.cpp \
 	$(DIR)/ZConsWriter.cpp \