--- trunk/OOPSE/libmdtools/Makefile.in 2003/09/25 16:42:34 785 +++ trunk/OOPSE/libmdtools/Makefile.in 2003/10/27 23:00:59 826 @@ -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@ @@ -118,7 +121,7 @@ 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) @@ -166,6 +169,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 +190,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 \