|
Last change
on this file since 97dff0 was 353326, checked in by Frederik Heber <heber@…>, 12 years ago |
|
FIX: Changed LIBADDs and LDADDs to get rid of libtool patching.
- with the new ubuntu version libtool is told not to pass through dependencies
in a hierarchy of shared libraries. Thus, we have been using a small patch
to tell libtool to pass nonetheless.
However, this is not necessary if the structure is slightly changed:
- cleanUp now resides with libMolecuilderUI.la instead of molecuilder and
molecuildergui directly
- added LIBADD to libMolecuilder.la with libMolecuilderShapes.la
- fixed some unit tests LDADDs
|
-
Property mode
set to
100644
|
|
File size:
1.3 KB
|
| Rev | Line | |
|---|
| [d766b5] | 1 | # PLEASE adhere to the alphabetical ordering in this Makefile!
|
|---|
| 2 | # Also indentation by a single tab
|
|---|
| 3 |
|
|---|
| [455573] | 4 | DESCRIPTORTESTSSOURCES = \
|
|---|
| 5 | ../Descriptors/unittests/AtomDescriptorUnitTest.cpp \
|
|---|
| 6 | ../Descriptors/unittests/MoleculeDescriptorUnitTest.cpp
|
|---|
| [d766b5] | 7 |
|
|---|
| [455573] | 8 | DESCRIPTORTESTSHEADERS = \
|
|---|
| 9 | ../Descriptors/unittests/AtomDescriptorUnitTest.hpp \
|
|---|
| 10 | ../Descriptors/unittests/MoleculeDescriptorUnitTest.hpp
|
|---|
| [d766b5] | 11 |
|
|---|
| [455573] | 12 | DESCRIPTORTESTS = \
|
|---|
| [6c9adc] | 13 | AtomDescriptorUnitTest \
|
|---|
| 14 | MoleculeDescriptorTest
|
|---|
| [d766b5] | 15 |
|
|---|
| [455573] | 16 | TESTS += $(DESCRIPTORTESTS)
|
|---|
| 17 | check_PROGRAMS += $(DESCRIPTORTESTS)
|
|---|
| 18 | noinst_PROGRAMS += $(DESCRIPTORTESTS)
|
|---|
| [d766b5] | 19 |
|
|---|
| [455573] | 20 | DESCRIPTORLIBS = \
|
|---|
| [353326] | 21 | ../libMolecuilderUI.la
|
|---|
| [eb0d77] | 22 | if CONDJOBMARKET
|
|---|
| 23 | DESCRIPTORLIBS += \
|
|---|
| 24 | ../libMolecuilderJobs.la
|
|---|
| 25 | endif
|
|---|
| 26 | DESCRIPTORLIBS += \
|
|---|
| [bf4b9f] | 27 | $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
|
|---|
| [353326] | 28 | ${CodePatterns_LIBS} \
|
|---|
| 29 | $(BOOST_LIB)
|
|---|
| [d766b5] | 30 |
|
|---|
| 31 |
|
|---|
| 32 | AtomDescriptorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
|
|---|
| [455573] | 33 | ../Descriptors/unittests/AtomDescriptorUnitTest.cpp \
|
|---|
| 34 | ../Descriptors/unittests/AtomDescriptorUnitTest.hpp
|
|---|
| 35 | AtomDescriptorUnitTest_LDADD = ${DESCRIPTORLIBS}
|
|---|
| [d766b5] | 36 |
|
|---|
| [6c9adc] | 37 | MoleculeDescriptorTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
|
|---|
| [455573] | 38 | ../Descriptors/unittests/MoleculeDescriptorUnitTest.cpp \
|
|---|
| 39 | ../Descriptors/unittests/MoleculeDescriptorUnitTest.hpp
|
|---|
| 40 | MoleculeDescriptorTest_LDADD = ${DESCRIPTORLIBS}
|
|---|
| [6c9adc] | 41 |
|
|---|
| [d766b5] | 42 |
|
|---|
| 43 |
|
|---|
| 44 | #AUTOMAKE_OPTIONS = parallel-tests
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
