diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-12-05 16:36:13 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2014-12-12 12:00:20 +0100 |
| commit | 700df2388670a7d374f58c2005001d277deb1618 (patch) | |
| tree | 82a5c2686a625c69c19eac4776617de7440636fd /src/libstrongswan/Makefile.am | |
| parent | f55a03a2de5d95389ef2417ad6ca393e1921f9ba (diff) | |
| download | strongswan-700df2388670a7d374f58c2005001d277deb1618.tar.bz2 strongswan-700df2388670a7d374f58c2005001d277deb1618.tar.xz | |
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).
Diffstat (limited to 'src/libstrongswan/Makefile.am')
| -rw-r--r-- | src/libstrongswan/Makefile.am | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 9a6e03632..91d92c3f3 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -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 - - |