| Revisión | 9cabb6a11490b5ed8b21589439eab3a24785521f (tree) |
|---|---|
| Tiempo | 2013-12-25 17:02:00 |
| Autor | Mikiya Fujii <mikiya.fujii@gmai...> |
| Commiter | Mikiya Fujii |
branch/0.3.x.r1593 is 'manually' merged to trunk. This merge is related to #32650 and #32655. #32676
git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1596 1136aad2-a195-0410-b898-f5ea1d11b9d8
doc/README.txt (diff)
src/Makefile (diff) src/Makefile_GNU (diff)| @@ -23,8 +23,9 @@ | ||
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | MolDS ("Mol"ecular "D"ynamics "S"imulation package) ver. 0.4.0 (Under developement) |
| 26 | - developed by Mikiya Fujii, Ph.D., Katsuhiko Nishimra, and Michihiro Okuyama, Ph.D.. | |
| 27 | - For Questions and bug reports: molds-dev@lists.sourceforge.jp | |
| 26 | + Developers: Mikiya Fujii, Ph.D.(project lead), Katsuhiko Nishimra, and Michihiro Okuyama, Ph.D.. | |
| 27 | + Other contributors: Michael Banck | |
| 28 | + Questions and bug reports: molds-dev@lists.sourceforge.jp | |
| 28 | 29 | |
| 29 | 30 | |
| 30 | 31 | ============================================================================== |
| @@ -36,22 +36,23 @@ endif | ||
| 36 | 36 | EXENAME = molds |
| 37 | 37 | DEPFILE = obj/objfile.dep |
| 38 | 38 | LDFLAGS = -Wl,-rpath=$(BOOST_LIB_DIR) |
| 39 | +THIS_MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) | |
| 39 | 40 | |
| 40 | 41 | ALL_CPP_FILES = base/Enums.cpp base/PrintController.cpp base/MolDSException.cpp base/MallocerFreer.cpp mpi/MpiProcess.cpp mpi/AsyncCommunicator.cpp wrappers/Blas.cpp wrappers/Lapack.cpp base/Utilities.cpp base/MathUtilities.cpp base/EularAngle.cpp base/Parameters.cpp base/RealSphericalHarmonicsIndex.cpp base/atoms/Atom.cpp base/atoms/Hatom.cpp base/atoms/Liatom.cpp base/atoms/Catom.cpp base/atoms/Natom.cpp base/atoms/Oatom.cpp base/atoms/Satom.cpp base/atoms/mm/EnvironmentalPointCharge.cpp base/factories/AtomFactory.cpp base/Molecule.cpp base/InputParser.cpp base/GTOExpansionSTO.cpp base/loggers/MOLogger.cpp base/loggers/DensityLogger.cpp base/loggers/HoleDensityLogger.cpp base/loggers/ParticleDensityLogger.cpp cndo/Cndo2.cpp indo/Indo.cpp zindo/ZindoS.cpp mndo/Mndo.cpp am1/Am1.cpp am1/Am1D.cpp pm3/Pm3.cpp pm3/Pm3D.cpp pm3/Pm3Pddg.cpp base/factories/ElectronicStructureFactory.cpp md/MD.cpp mc/MC.cpp rpmd/RPMD.cpp nasco/NASCO.cpp optimization/Optimizer.cpp optimization/ConjugateGradient.cpp optimization/SteepestDescent.cpp optimization/BFGS.cpp optimization/GEDIIS.cpp base/factories/OptimizerFactory.cpp base/MolDS.cpp Main.cpp |
| 41 | 42 | ALL_HEAD_FILES = config.h base/Enums.h base/Uncopyable.h base/PrintController.h base/MolDSException.h base/containers/ThreadSafeQueue.h base/MallocerFreer.h mpi/MpiInt.h mpi/MpiProcess.h mpi/AsyncCommunicator.h wrappers/Blas.h wrappers/Lapack.h base/Utilities.h base/MathUtilities.h base/EularAngle.h base/Parameters.h base/RealSphericalHarmonicsIndex.h base/atoms/Atom.h base/atoms/Hatom.h base/atoms/Liatom.h base/atoms/Catom.h base/atoms/Natom.h base/atoms/Oatom.h base/atoms/Satom.h base/atoms/mm/EnvironmentalPointCharge.h base/factories/AtomFactory.h base/Molecule.h base/InputParser.h base/GTOExpansionSTO.h base/loggers/MOLogger.h base/loggers/DensityLogger.h base/loggers/HoleDensityLogger.h base/loggers/ParticleDensityLogger.h base/ElectronicStructure.h cndo/Cndo2.h cndo/ReducedOverlapAOsParameters.h indo/Indo.h zindo/ZindoS.h mndo/Mndo.h am1/Am1.h am1/Am1D.h pm3/Pm3.h pm3/Pm3D.h pm3/Pm3Pddg.h base/factories/ElectronicStructureFactory.h md/MD.h mc/MC.h rpmd/RPMD.h nasco/NASCO.h optimization/Optimizer.h optimization/ConjugateGradient.h optimization/SteepestDescent.h optimization/BFGS.h optimization/GEDIIS.h base/factories/OptimizerFactory.h base/MolDS.h |
| 42 | 43 | ALL_OBJ_FILES = obj/Enums.o obj/PrintController.o obj/MolDSException.o obj/MallocerFreer.o obj/MpiProcess.o obj/AsyncCommunicator.o obj/Blas.o obj/Lapack.o obj/Utilities.o obj/MathUtilities.o obj/EularAngle.o obj/Parameters.o obj/RealSphericalHarmonicsIndex.o obj/Atom.o obj/Hatom.o obj/Liatom.o obj/Catom.o obj/Natom.o obj/Oatom.o obj/Satom.o obj/EnvironmentalPointCharge.o obj/AtomFactory.o obj/Molecule.o obj/InputParser.o obj/GTOExpansionSTO.o obj/MOLogger.o obj/DensityLogger.o obj/HoleDensityLogger.o obj/ParticleDensityLogger.o obj/Cndo2.o obj/Indo.o obj/ZindoS.o obj/Mndo.o obj/Am1.o obj/Am1D.o obj/Pm3.o obj/Pm3D.o obj/Pm3Pddg.o obj/ElectronicStructureFactory.o obj/MD.o obj/MC.o obj/RPMD.o obj/NASCO.o obj/Optimizer.o obj/ConjugateGradient.o obj/SteepestDescent.o obj/BFGS.o obj/GEDIIS.o obj/OptimizerFactory.o obj/MolDS.o obj/Main.o |
| 43 | 44 | |
| 44 | -$(EXENAME): $(ALL_OBJ_FILES) | |
| 45 | +$(EXENAME): $(DEPFILE) $(ALL_OBJ_FILES) | |
| 45 | 46 | $(CC) -o $@ $(LDFLAGS) -L$(BOOST_LIB_DIR) $(ALL_OBJ_FILES) $(LIBS) |
| 46 | 47 | |
| 47 | 48 | -include $(DEPFILE) |
| 48 | 49 | |
| 49 | 50 | .PHONY: depend |
| 50 | 51 | depend: |
| 51 | - rm $(DEPFILE) | |
| 52 | - +make $(DEPFILE) | |
| 52 | + -rm -f $(DEPFILE) | |
| 53 | + +make -f $(THIS_MAKEFILE) $(DEPFILE) | |
| 53 | 54 | |
| 54 | -$(DEPFILE): Makefile | |
| 55 | +$(DEPFILE): $(THIS_MAKEFILE) $(ALL_CPP_FILES) $(ALL_HEAD_FILES) | |
| 55 | 56 | $(CC) -MM $(ALL_CPP_FILES) -I$(BOOST_INC_DIR) | sed 's/^\([^ ]\)/obj\/\1/g' | sed 's/\($$*\)\.o[ :]*/\1.o : /g' > $(DEPFILE) |
| 56 | 57 | |
| 57 | 58 | $(ALL_OBJ_FILES): |
| @@ -59,6 +60,6 @@ $(ALL_OBJ_FILES): | ||
| 59 | 60 | |
| 60 | 61 | .PHONY: clean |
| 61 | 62 | clean: |
| 62 | - rm -f $(ALL_OBJ_FILES) $(EXENAME) $(DEPFILE) | |
| 63 | + -rm -f $(ALL_OBJ_FILES) $(EXENAME) $(DEPFILE) | |
| 63 | 64 | |
| 64 | -all: clean $(EXENAME) | |
| 65 | +all: clean depend $(EXENAME) |
| @@ -33,27 +33,30 @@ LIBS = $(LIBSBASE) $(BOOST_LIBS) $(OPENBLAS_LIBS) | ||
| 33 | 33 | EXENAME = molds |
| 34 | 34 | DEPFILE = obj/objfile.dep |
| 35 | 35 | LDFLAGS = -Wl,-rpath=$(BOOST_LIB_DIR) -Wl,-rpath=$(OPENBLAS_LIB_DIR) |
| 36 | +THIS_MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) | |
| 36 | 37 | |
| 37 | 38 | ALL_CPP_FILES = base/Enums.cpp base/PrintController.cpp base/MolDSException.cpp base/MallocerFreer.cpp mpi/MpiProcess.cpp mpi/AsyncCommunicator.cpp wrappers/Blas.cpp wrappers/Lapack.cpp base/Utilities.cpp base/MathUtilities.cpp base/EularAngle.cpp base/Parameters.cpp base/atoms/Atom.cpp base/atoms/Hatom.cpp base/atoms/Liatom.cpp base/atoms/Catom.cpp base/atoms/Natom.cpp base/atoms/Oatom.cpp base/atoms/Satom.cpp base/atoms/mm/EnvironmentalPointCharge.cpp base/factories/AtomFactory.cpp base/Molecule.cpp base/InputParser.cpp base/GTOExpansionSTO.cpp base/RealSphericalHarmonicsIndex.cpp base/loggers/MOLogger.cpp base/loggers/DensityLogger.cpp base/loggers/HoleDensityLogger.cpp base/loggers/ParticleDensityLogger.cpp cndo/Cndo2.cpp indo/Indo.cpp zindo/ZindoS.cpp mndo/Mndo.cpp am1/Am1.cpp am1/Am1D.cpp pm3/Pm3.cpp pm3/Pm3D.cpp pm3/Pm3Pddg.cpp base/factories/ElectronicStructureFactory.cpp md/MD.cpp mc/MC.cpp rpmd/RPMD.cpp nasco/NASCO.cpp optimization/Optimizer.cpp optimization/ConjugateGradient.cpp optimization/SteepestDescent.cpp optimization/BFGS.cpp optimization/GEDIIS.cpp base/factories/OptimizerFactory.cpp base/MolDS.cpp Main.cpp |
| 38 | 39 | ALL_HEAD_FILES = config.h base/Enums.h base/Uncopyable.h base/PrintController.h base/MolDSException.h base/containers/ThreadSafeQueue.h base/MallocerFreer.h mpi/MpiInt.h mpi/MpiProcess.h mpi/AsyncCommunicator.h wrappers/Blas.h wrappers/Lapack.h base/Utilities.h base/MathUtilities.h base/EularAngle.h base/Parameters.h base/atoms/Atom.h base/atoms/Hatom.h base/atoms/Liatom.h base/atoms/Catom.h base/atoms/Natom.h base/atoms/Oatom.h base/atoms/Satom.h base/atoms/mm/EnvironmentalPointCharge.h base/factories/AtomFactory.h base/Molecule.h base/InputParser.h base/GTOExpansionSTO.h base/RealSphericalHarmonicsIndex.h base/loggers/MOLogger.h base/loggers/DensityLogger.h base/loggers/HoleDensityLogger.h base/loggers/ParticleDensityLogger.h base/ElectronicStructure.h cndo/Cndo2.h cndo/ReducedOverlapAOsParameters.h indo/Indo.h zindo/ZindoS.h mndo/Mndo.h am1/Am1.h am1/Am1D.h pm3/Pm3.h pm3/Pm3D.h pm3/Pm3Pddg.h base/factories/ElectronicStructureFactory.h md/MD.h mc/MC.h rpmd/RPMD.h nasco/NASCO.h optimization/Optimizer.h optimization/ConjugateGradient.h optimization/SteepestDescent.h optimization/BFGS.h optimization/GEDIIS.h base/factories/OptimizerFactory.h base/MolDS.h |
| 39 | 40 | ALL_OBJ_FILES = obj/Enums.o obj/PrintController.o obj/MolDSException.o obj/MallocerFreer.o obj/MpiProcess.o obj/AsyncCommunicator.o obj/Blas.o obj/Lapack.o obj/Utilities.o obj/MathUtilities.o obj/EularAngle.o obj/Parameters.o obj/Atom.o obj/Hatom.o obj/Liatom.o obj/Catom.o obj/Natom.o obj/Oatom.o obj/Satom.o obj/EnvironmentalPointCharge.o obj/AtomFactory.o obj/Molecule.o obj/InputParser.o obj/GTOExpansionSTO.o obj/RealSphericalHarmonicsIndex.o obj/MOLogger.o obj/DensityLogger.o obj/HoleDensityLogger.o obj/ParticleDensityLogger.o obj/Cndo2.o obj/Indo.o obj/ZindoS.o obj/Mndo.o obj/Am1.o obj/Am1D.o obj/Pm3.o obj/Pm3D.o obj/Pm3Pddg.o obj/ElectronicStructureFactory.o obj/MD.o obj/MC.o obj/RPMD.o obj/NASCO.o obj/Optimizer.o obj/ConjugateGradient.o obj/SteepestDescent.o obj/BFGS.o obj/GEDIIS.o obj/OptimizerFactory.o obj/MolDS.o obj/Main.o |
| 40 | 41 | |
| 41 | -$(EXENAME): $(ALL_OBJ_FILES) | |
| 42 | +$(EXENAME): $(DEPFILE) $(ALL_OBJ_FILES) | |
| 42 | 43 | $(CC) -o $@ $(LDFLAGS) $(ALL_OBJ_FILES) -L$(BOOST_LIB_DIR) -L$(OPENBLAS_LIB_DIR) $(LIBS) |
| 43 | 44 | |
| 44 | 45 | -include $(DEPFILE) |
| 45 | 46 | |
| 46 | 47 | .PHONY: depend |
| 47 | 48 | depend: |
| 48 | - rm $(DEPFILE) | |
| 49 | - +make $(DEPFILE) | |
| 49 | + -rm -f $(DEPFILE) | |
| 50 | + +make -f $(THIS_MAKEFILE) $(DEPFILE) | |
| 50 | 51 | |
| 51 | -$(DEPFILE): Makefile_GNU | |
| 52 | +$(DEPFILE): $(THIS_MAKEFILE) $(ALL_CPP_FILES) $(ALL_HEAD_FILES) | |
| 52 | 53 | $(CC) -MM $(ALL_CPP_FILES) -I$(BOOST_INC_DIR) -I$(OPENBLAS_INC_DIR) | sed 's/^\([^ ]\)/obj\/\1/g' | sed 's/\($$*\)\.o[ :]*/\1.o : /g' > $(DEPFILE) |
| 54 | + | |
| 53 | 55 | $(ALL_OBJ_FILES): |
| 54 | 56 | $(CC) -I$(BOOST_INC_DIR) -I$(OPENBLAS_INC_DIR) -o $@ $< $(CFLAGS) -c |
| 57 | + | |
| 55 | 58 | .PHONY: clean |
| 56 | 59 | clean: |
| 57 | - rm -f $(ALL_OBJ_FILES) $(EXENAME) $(DEPFILE) | |
| 60 | + -rm -f $(ALL_OBJ_FILES) $(EXENAME) $(DEPFILE) | |
| 58 | 61 | |
| 59 | -all: clean $(EXENAME) | |
| 62 | +all: clean depend $(EXENAME) |
Fork