--- trunk/OOPSE/libmdtools/Makefile 2003/06/19 22:02:44 559 +++ trunk/OOPSE/libmdtools/Makefile 2003/06/20 20:29:36 561 @@ -29,25 +29,27 @@ MPI_FFLAGS=$(FFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES) MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES) MPI_FFLAGS=$(FFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES) +SRC_DIR := $(PWD) + # Then do the compile rules: obj/%.o: %.F90 - cd obj; $(FC) $(FFLAGS) -c ../$< + cd obj; $(FC) $(FFLAGS) -c $(SRC_DIR)/$< MPIobj/%.o: %.F90 - cd MPIobj; $(FC) $(MPI_FFLAGS) -c ../$< + cd MPIobj; $(FC) $(MPI_FFLAGS) -c $(SRC_DIR)/$< obj/%.o: %.cpp - cd obj; $(CXX) $(CXXFLAGS) -c ../$< + cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$< MPIobj/%.o: %.cpp - cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c ../$< + cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c $(SRC_DIR)/$< obj/%.o: %.c - cd obj; $(CC) $(CFLAGS) -c ../$< + cd obj; $(CC) $(CFLAGS) -c $(SRC_DIR)/$< MPIobj/%.o: %.c - cd MPIobj; $(CC) $(MPI_CFLAGS) -c ../$< + cd MPIobj; $(CC) $(MPI_CFLAGS) -c $(SRC_DIR)/$< # Then list what we have to compile @@ -62,7 +64,6 @@ CXX_FILES = \ $(DIR)/DirectionalAtom.cpp \ $(DIR)/DumpWriter.cpp \ $(DIR)/Exclude.cpp \ - $(DIR)/ExtendedSystem.cpp \ $(DIR)/InitializeFromFile.cpp \ $(DIR)/LJFF.cpp \ $(DIR)/SimInfo.cpp \ @@ -78,7 +79,8 @@ CXX_FILES = \ $(DIR)/fortranWrappers.cpp \ $(DIR)/ForceFields.cpp \ $(DIR)/mpiSimulation.cpp \ - $(DIR)/Molecule.cpp + $(DIR)/Molecule.cpp \ + $(DIR)/NVT.cpp F90_FILES= \