Last change
on this file since 41c00d was 3b470f, checked in by Frederik Heber <heber@…>, 16 years ago |
Merge branch 'Thermostat'
Conflicts:
.gitignore
Makefile.am
molecuilder/src/analyzer.cpp
molecuilder/src/builder.cpp
molecuilder/src/config.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/molecules.cpp
molecuilder/src/molecules.hpp
- config::SaveMPQC() has different call parameters
- analyzer and joiner had conflicts due to Chi and ChiPAS values
- molecule::VerletForceIntegration() is slightly different too, but Thermostat supposedly is old version
|
-
Property mode
set to
100755
|
File size:
344 bytes
|
Line | |
---|
1 | ACLOCAL_AMFLAGS = -I m4
|
---|
2 | SUBDIRS = src doc tests
|
---|
3 | DIST_SUBDIRS = ${SUBDIRS}
|
---|
4 |
|
---|
5 | #include aminclude.am
|
---|
6 |
|
---|
7 | pcpdir = ${bindir}
|
---|
8 |
|
---|
9 | EXTRA_DIST = autogen.sh
|
---|
10 |
|
---|
11 | #configs.tar.gz:
|
---|
12 | # $(TAR) -zcvf $(srcdir)/configs.tar.gz `find $(srcdir) -name 'main_pcp_linux'`
|
---|
13 |
|
---|
14 | #pseudopots.tar.gz:
|
---|
15 | # $(TAR) -zcvf $(srcdir)/pseudopots.tar.gz `find $(srcdir) -name 'pseudo.??'`
|
---|
16 |
|
---|
Note:
See
TracBrowser
for help on using the repository browser.