|
Last change
on this file since c830e8e was e08f45, checked in by Frederik Heber <heber@…>, 17 years ago |
|
Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull
Conflicts:
molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp
util/src/NanoCreator.c
Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.
Additionally, vector had ofstream << operator instead ostream << ...
|
-
Property mode
set to
100755
|
|
File size:
391 bytes
|
| Line | |
|---|
| 1 | #ACLOCAL_AMFLAGS = -I m4
|
|---|
| 2 | SUBDIRS = pcp util molecuilder
|
|---|
| 3 | DIST_SUBDIRS = ${SUBDIRS}
|
|---|
| 4 |
|
|---|
| 5 | #include aminclude.am
|
|---|
| 6 |
|
|---|
| 7 | pcpdir = ${bindir}
|
|---|
| 8 |
|
|---|
| 9 | EXTRA_DIST = util/suffix autogen.sh util/visual.cfg util/visual.net
|
|---|
| 10 |
|
|---|
| 11 | configs.tar.gz:
|
|---|
| 12 | $(TAR) -zcvf $(srcdir)/configs.tar.gz `find $(srcdir) -name 'main_pcp_linux'`
|
|---|
| 13 |
|
|---|
| 14 |
|
|---|
| 15 | pseudopots.tar.gz:
|
|---|
| 16 | $(TAR) -zcvf $(srcdir)/pseudopots.tar.gz `find $(srcdir) -name 'pseudo.??'`
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
