|
Last change
on this file since 88bb6b was 353326, checked in by Frederik Heber <heber@…>, 13 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.7 KB
|
| Rev | Line | |
|---|
| [0e2031] | 1 | # PLEASE adhere to the alphabetical ordering in this Makefile!
|
|---|
| 2 | # Also indentation by a single tab
|
|---|
| 3 |
|
|---|
| [455573] | 4 | UIELEMENTSMENUTESTSSOURCES = \
|
|---|
| 5 | ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
|
|---|
| 6 | ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp
|
|---|
| [0e2031] | 7 |
|
|---|
| [455573] | 8 | UIELEMENTSMENUTESTSHEADERS = \
|
|---|
| 9 | ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
|
|---|
| 10 | ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp
|
|---|
| [0e2031] | 11 |
|
|---|
| [455573] | 12 | UIELEMENTSMENUTESTS = \
|
|---|
| [197e13] | 13 | MenuDescriptionUnitTest \
|
|---|
| 14 | MenuDescription_ActionRegistry_ConsistencyUnitTest
|
|---|
| [0e2031] | 15 |
|
|---|
| [455573] | 16 | TESTS += $(UIELEMENTSMENUTESTS)
|
|---|
| 17 | check_PROGRAMS += $(UIELEMENTSMENUTESTS)
|
|---|
| 18 | noinst_PROGRAMS += $(UIELEMENTSMENUTESTS)
|
|---|
| [0e2031] | 19 |
|
|---|
| [353326] | 20 | MENULIBS = \
|
|---|
| 21 | ../libMolecuilderUI.la
|
|---|
| 22 | if CONDJOBMARKET
|
|---|
| 23 | MENULIBS += \
|
|---|
| 24 | ../libMolecuilderJobs.la
|
|---|
| 25 | endif
|
|---|
| 26 | MENULIBS += \
|
|---|
| 27 | $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
|
|---|
| 28 | ${CodePatterns_LIBS} \
|
|---|
| 29 | $(BOOST_LIB)
|
|---|
| [0e2031] | 30 |
|
|---|
| 31 | MenuDescriptionUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
|
|---|
| [455573] | 32 | ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
|
|---|
| 33 | ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
|
|---|
| 34 | ../UIElements/Menu/MenuDescription.cpp \
|
|---|
| 35 | ../UIElements/Menu/MenuDescription.hpp
|
|---|
| 36 | MenuDescriptionUnitTest_CXXFLAGS = -I$(top_srcdir)/src/UIElements
|
|---|
| [0e2031] | 37 | MenuDescriptionUnitTest_LDADD = $(MENULIBS)
|
|---|
| 38 |
|
|---|
| [197e13] | 39 | MenuDescription_ActionRegistry_ConsistencyUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
|
|---|
| [455573] | 40 | ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp \
|
|---|
| 41 | ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp
|
|---|
| [197e13] | 42 | MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD = \
|
|---|
| [353326] | 43 | $(MENULIBS)
|
|---|
| [197e13] | 44 |
|
|---|
| 45 |
|
|---|
| [0e2031] | 46 | #AUTOMAKE_OPTIONS = parallel-tests
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
