| Revision | 4efed2c44f5a79306e9db5630333e01ee979b611 (tree) |
|---|---|
| Time | 2014-01-10 01:24:37 |
| Author | Katsuhiko Nishimra <ktns.87@gmai...> |
| Commiter | Katsuhiko Nishimra |
Change final output file name. #28588
git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/automake@1628 1136aad2-a195-0410-b898-f5ea1d11b9d8
src/Makefile (diff) src/Makefile.am (diff)| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | #//************************************************************************// |
| 2 | -#// Copyright (C) 2012-2012 Katsuhiko Nishimra // | |
| 2 | +#// Copyright (C) 2012-2014 Katsuhiko Nishimra // | |
| 3 | 3 | #// // |
| 4 | 4 | #// This file is part of MolDS. // |
| 5 | 5 | #// // |
| @@ -36,18 +36,20 @@ else | ||
| 36 | 36 | override CONFIGURE_OPTIONS += --with-boost=$(BOOSTDIR) |
| 37 | 37 | endif |
| 38 | 38 | |
| 39 | -all: MolDS.out | |
| 39 | +OUTPUT=molds | |
| 40 | + | |
| 41 | +all: $(OUTPUT) | |
| 40 | 42 | |
| 41 | 43 | build/Makefile: |
| 42 | 44 | mkdir -p build |
| 43 | 45 | cd build; \ |
| 44 | 46 | ../configure $(CONFIGURE_OPTIONS) CXXFLAGS='$(CXXFLAGS)' LDFLAGS='$(LDFLAGS)' |
| 45 | 47 | |
| 46 | -build/MolDS: build/Makefile $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard */*.h) | |
| 48 | +build/$(OUTPUT): build/Makefile $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard */*.h) | |
| 47 | 49 | +make -C build |
| 48 | 50 | |
| 49 | -MolDS.out: build/MolDS | |
| 51 | +$(OUTPUT): build/$(OUTPUT) | |
| 50 | 52 | install $< $@ |
| 51 | 53 | |
| 52 | 54 | clean: |
| 53 | - rm -rf build MolDS.out | |
| 55 | + rm -rf build $(OUTPUT) |
| @@ -1,5 +1,5 @@ | ||
| 1 | -bin_PROGRAMS = MolDS | |
| 2 | -MolDS_SOURCES = 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/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 \ | |
| 1 | +bin_PROGRAMS = molds | |
| 2 | +molds_SOURCES = 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/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 \ | |
| 3 | 3 | base/Enums.h base/Uncopyable.h base/PrintController.h base/MolDSException.h base/containers/ThreadSafeQueue.h base/MallocerFreer.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/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 |
| 4 | 4 | |
| 5 | 5 | ACLOCAL_AMFLAGS = -I m4 |
Fork