bliss: Fix monolithic build

This requires moving test files so that the Makefile for the tests can be
included after building libstrongswan, which requires the plugin when
building monolithically.  Due to this a static helper library is required
as directly referring to object files (or source files) is not possible.

It's also necessary to avoid any link-time dependency on libstrongswan in
bliss_huffman, to avoid circular dependencies (bliss_huffman -> libstrongswan
-> bliss -> bliss_huffman).
This commit is contained in:
Tobias Brunner
2014-12-12 12:00:20 +01:00
committed by Andreas Steffen
parent f55a03a2de
commit 700df23886
13 changed files with 123 additions and 100 deletions
+8 -7
View File
@@ -546,6 +546,13 @@ if MONOLITHIC
endif
endif
if USE_BLISS
SUBDIRS += plugins/bliss
if MONOLITHIC
libstrongswan_la_LIBADD += plugins/bliss/libstrongswan-bliss.la
endif
endif
if USE_TEST_VECTORS
SUBDIRS += plugins/test_vectors
if MONOLITHIC
@@ -557,12 +564,6 @@ if MONOLITHIC
SUBDIRS += .
endif
SUBDIRS += tests
if USE_BLISS
SUBDIRS += plugins/bliss
if MONOLITHIC
libstrongswan_la_LIBADD += plugins/bliss/libstrongswan-bliss.la
SUBDIRS += plugins/bliss/tests
endif
endif