|
Last change
on this file since 0647f4 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:
1.1 KB
|
| Line | |
|---|
| 1 | AUTOM4TE = autom4te
|
|---|
| 2 | EXTRA_DIST = testsuite.at $(TESTSUITE) atlocal.in
|
|---|
| 3 | TESTSUITE = $(srcdir)/testsuite
|
|---|
| 4 |
|
|---|
| 5 | check-local: atconfig atlocal package.m4 $(TESTSUITE)
|
|---|
| 6 | $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
|
|---|
| 7 |
|
|---|
| 8 | installcheck-local: atconfig atlocal $(TESTSUITE)
|
|---|
| 9 | $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
|
|---|
| 10 | $(TESTSUITEFLAGS)
|
|---|
| 11 |
|
|---|
| 12 | clean-local:
|
|---|
| 13 | test ! -f '$(TESTSUITE)' || \
|
|---|
| 14 | $(SHELL) '$(TESTSUITE)' --clean
|
|---|
| 15 |
|
|---|
| 16 | AUTOTEST = $(AUTOM4TE) --language=autotest
|
|---|
| 17 | $(TESTSUITE): $(srcdir)/testsuite.at
|
|---|
| 18 | $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
|
|---|
| 19 | mv $@.tmp $@
|
|---|
| 20 |
|
|---|
| 21 | # The `:;' works around a Bash 3.2 bug when the output is not writeable.
|
|---|
| 22 | $(srcdir)/package.m4: $(top_srcdir)/configure.ac
|
|---|
| 23 | :;{ \
|
|---|
| 24 | echo '# Signature of the current package.' && \
|
|---|
| 25 | echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])' && \
|
|---|
| 26 | echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])' && \
|
|---|
| 27 | echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])' && \
|
|---|
| 28 | echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])' && \
|
|---|
| 29 | echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
|
|---|
| 30 | } >'$(srcdir)/package.m4'
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
