Last change
on this file since 246a3c 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:
421 bytes
|
Rev | Line | |
---|
[a0bcf1] | 1 | #ACLOCAL_AMFLAGS = -I m4
|
---|
| 2 | SUBDIRS = pcp util molecuilder
|
---|
[bb28e0] | 3 | DIST_SUBDIRS = ${SUBDIRS}
|
---|
| 4 | TAR=/bin/tar
|
---|
[a0bcf1] | 5 |
|
---|
| 6 | #include aminclude.am
|
---|
| 7 |
|
---|
| 8 | pcpdir = ${bindir}
|
---|
| 9 |
|
---|
[bb28e0] | 10 | EXTRA_DIST = util/suffix autogen.sh pseudopots.tar.gz util/visual.cfg util/visual.net
|
---|
[a0bcf1] | 11 |
|
---|
| 12 | configs.tar.gz:
|
---|
| 13 | $(TAR) -zcvf $(srcdir)/configs.tar.gz `find $(srcdir) -name 'main_pcp_linux'`
|
---|
| 14 |
|
---|
| 15 |
|
---|
| 16 | pseudopots.tar.gz:
|
---|
| 17 | $(TAR) -zcvf $(srcdir)/pseudopots.tar.gz `find $(srcdir) -name 'pseudo.??'`
|
---|
Note:
See
TracBrowser
for help on using the repository browser.