|
Last change
on this file since 082da1 was e71890, checked in by Frederik Heber <heber@…>, 16 years ago |
|
Merge branch 'new-delete-conversion' into CodeRefactoring
Conflicts:
molecuilder/src/Makefile.am
molecuilder/src/helpers.cpp
molecuilder/src/helpers.hpp
molecuilder/src/memoryusageobserver.cpp
- FIX: performCriticalExit() was declared static but not defined a such.
- Merge was basically only due to libmolecuilder which was not used in CodeRefactoring branch before.
- added ActOnAll Unit test to new unittests sub folder and to Makefile.am
|
-
Property mode
set to
100644
|
|
File size:
1.5 KB
|
| Line | |
|---|
| 1 | SOURCE = atom.cpp bond.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp graph.cpp helpers.cpp leastsquaremin.cpp linkedcell.cpp memoryusageobserver.cpp moleculelist.cpp molecule.cpp molecule_dynamics.cpp molecule_fragmentation.cpp molecule_geometry.cpp molecule_graph.cpp molecule_pointcloud.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
|
|---|
| 2 | HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp graph.hpp helpers.hpp leastsquaremin.hpp linkedcell.hpp lists.hpp memoryallocator.hpp memoryusageobserver.hpp molecule.hpp molecule_template.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
|
|---|
| 3 |
|
|---|
| 4 | BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
|
|---|
| 5 | INCLUDES = -I$(top_srcdir)/src/unittests
|
|---|
| 6 |
|
|---|
| 7 | noinst_LIBRARIES = libmolecuilder.a
|
|---|
| 8 | bin_PROGRAMS = molecuilder joiner analyzer
|
|---|
| 9 | molecuilderdir = ${bindir}
|
|---|
| 10 | libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
|
|---|
| 11 | molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
|
|---|
| 12 | molecuilder_LDFLAGS = $(BOOST_LIB)
|
|---|
| 13 | molecuilder_SOURCES = builder.cpp
|
|---|
| 14 | molecuilder_LDADD = libmolecuilder.a
|
|---|
| 15 | joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
|
|---|
| 16 | joiner_LDADD = libmolecuilder.a
|
|---|
| 17 | analyzer_SOURCES = analyzer.cpp datacreator.cpp parser.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp
|
|---|
| 18 | analyzer_LDADD = libmolecuilder.a
|
|---|
| 19 |
|
|---|
| 20 | #EXTRA_DIST = ${molecuilder_DATA}
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
