|
Last change
on this file since 11cc05 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.2 KB
|
| Rev | Line | |
|---|
| [97c2550] | 1 | # PLEASE adhere to the alphabetical ordering in this Makefile!
|
|---|
| 2 | # Also indentation by a single tab
|
|---|
| 3 |
|
|---|
| 4 | ATOMTESTSSOURCES = \
|
|---|
| [99f4ee] | 5 | ../Atom/unittests/AtomObserverUnitTest.cpp \
|
|---|
| [9e1d01] | 6 | ../Atom/unittests/CopyAtomsInterfaceUnitTest.cpp \
|
|---|
| [99f4ee] | 7 | stubs/ObserverStub.cpp
|
|---|
| [97c2550] | 8 |
|
|---|
| 9 | ATOMTESTSHEADERS = \
|
|---|
| [99f4ee] | 10 | ../Atom/unittests/AtomObserverUnitTest.hpp \
|
|---|
| [9e1d01] | 11 | ../Atom/unittests/CopyAtomsInterfaceUnitTest.hpp \
|
|---|
| [99f4ee] | 12 | stubs/ObserverStub.hpp
|
|---|
| [97c2550] | 13 |
|
|---|
| 14 | ATOMTESTS = \
|
|---|
| [9e1d01] | 15 | AtomObserverUnitTest \
|
|---|
| 16 | CopyAtomsInterfaceUnitTest
|
|---|
| [97c2550] | 17 |
|
|---|
| 18 | TESTS += $(ATOMTESTS)
|
|---|
| 19 | check_PROGRAMS += $(ATOMTESTS)
|
|---|
| 20 | noinst_PROGRAMS += $(ATOMTESTS)
|
|---|
| 21 |
|
|---|
| 22 | ATOMTESTLIBS = \
|
|---|
| [353326] | 23 | ../libMolecuilderUI.la
|
|---|
| [eb0d77] | 24 | ATOMTESTLIBS += \
|
|---|
| [97c2550] | 25 | $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
|
|---|
| [353326] | 26 | ${CodePatterns_LIBS} \
|
|---|
| 27 | $(BOOST_LIB)
|
|---|
| [97c2550] | 28 |
|
|---|
| 29 | AtomObserverUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
|
|---|
| 30 | ../Atom/unittests/AtomObserverUnitTest.cpp \
|
|---|
| 31 | ../Atom/unittests/AtomObserverUnitTest.hpp \
|
|---|
| [99f4ee] | 32 | stubs/ObserverStub.cpp \
|
|---|
| 33 | stubs/ObserverStub.hpp
|
|---|
| [97c2550] | 34 | AtomObserverUnitTest_LDADD = ${ATOMTESTLIBS}
|
|---|
| 35 |
|
|---|
| [9e1d01] | 36 | CopyAtomsInterfaceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
|
|---|
| 37 | ../Atom/unittests/CopyAtomsInterfaceUnitTest.cpp \
|
|---|
| 38 | ../Atom/unittests/CopyAtomsInterfaceUnitTest.hpp
|
|---|
| 39 | CopyAtomsInterfaceUnitTest_LDADD = ${ATOMTESTLIBS}
|
|---|
| [97c2550] | 40 |
|
|---|
| 41 |
|
|---|
| 42 | #AUTOMAKE_OPTIONS = parallel-tests
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
