client-test: unit tests not included when building statically
Due to a typo in the src/syncevolution -> src/syncevo transition, unit tests inside libsyncevolution.a were not included in the client-test executable. The check of libsyncevolution.a searched for the library in synccevo instead of syncevo. Also merged updated dependency list from master branch.
This commit is contained in:
parent
50098b5329
commit
08eab6ee8f
1 changed files with 2 additions and 2 deletions
|
@ -200,8 +200,8 @@ CLIENT_LIB_TEST_FILES += $(TEST_FILES_GENERATED)
|
|||
|
||||
client_test_CPPFLAGS = -DHAVE_CONFIG_H -DENABLE_INTEGRATION_TESTS -DENABLE_UNIT_TESTS $(AM_CPPFLAGS)
|
||||
client_test_CXXFLAGS = `cppunit-config --cflags` $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS)
|
||||
client_test_LDFLAGS = `cppunit-config --libs` `nm synccevo/.libs/libsyncevolution.a | grep funambolAutoRegisterRegistry | sed -e 's/.* /-u /'` $(CORE_LD_FLAGS)
|
||||
client_test_LDADD = $(CORE_LDADD)
|
||||
client_test_LDFLAGS = `cppunit-config --libs` `nm syncevo/.libs/libsyncevolution.a | grep funambolAutoRegisterRegistry | sed -e 's/.* /-u /'` $(CORE_LD_FLAGS)
|
||||
client_test_LDADD = $(CORE_LDADD) $(SYNTHESIS_ENGINE)
|
||||
# These dependencies are intentionally a bit too broad:
|
||||
# they ensure that all files are in place to *run* client-test.
|
||||
|
||||
|
|
Loading…
Reference in a new issue