fixed integrity tests of plugins using libsimaka

diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index ce459f6478054796fbb3edb9f6db4449d958fbeb..4d2fd655cca1db243856fdbfe70b87ba23eb5a8a 100644 (file)
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -26,5 +26,9 @@ if USE_LIBTNCCS
   charon_LDADD += $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
+if USE_LIBSIMAKA
+  charon_LDADD += $(top_builddir)/src/libsimaka/libsimaka.la
+endif
+
 EXTRA_DIST = Android.mk
 

diff --git a/src/libcharon/plugins/eap_aka/Makefile.am b/src/libcharon/plugins/eap_aka/Makefile.am
index d37d1691cade12204fce2e7fbaf7601814338e36..1e8af09f8aa7aba81c97dd881b17250a0a74051c 100644 (file)
--- a/src/libcharon/plugins/eap_aka/Makefile.am
+++ b/src/libcharon/plugins/eap_aka/Makefile.am
@@ -8,7 +8,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-aka.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-aka.la
-libstrongswan_eap_aka_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_aka_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am b/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
index b4d6dc1d2227e4fb3a4b3c1382345b59fdd25a6f..c75c5f1bec4e46cc32d3a47acb9341c59922a88c 100644 (file)
--- a/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
+++ b/src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
@@ -11,7 +11,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-aka-3gpp2.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-aka-3gpp2.la
-libstrongswan_eap_aka_3gpp2_la_LIBADD += $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_aka_3gpp2_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_sim/Makefile.am b/src/libcharon/plugins/eap_sim/Makefile.am
index a0cb72f5f26bcc3438c82acf1719c61a9b9d2d0d..408872c5e3a93f6dc430a12e174174667d294faf 100644 (file)
--- a/src/libcharon/plugins/eap_sim/Makefile.am
+++ b/src/libcharon/plugins/eap_sim/Makefile.am
@@ -8,7 +8,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-sim.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-sim.la
-libstrongswan_eap_sim_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_sim_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_sim_file/Makefile.am b/src/libcharon/plugins/eap_sim_file/Makefile.am
index d76cdc5cafc4040166a9e617d3f4b46ec0db04f9..0606550a9f906082052af6756f2557196139be88 100644 (file)
--- a/src/libcharon/plugins/eap_sim_file/Makefile.am
+++ b/src/libcharon/plugins/eap_sim_file/Makefile.am
@@ -8,7 +8,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-sim-file.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-sim-file.la
-libstrongswan_eap_sim_file_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_sim_file_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_sim_pcsc/Makefile.am b/src/libcharon/plugins/eap_sim_pcsc/Makefile.am
index fae6fccfcad7853f41c7555ad8d4f2cb6597ae23..e97379550acb9d45fb312a9a2b88393953702c41 100644 (file)
--- a/src/libcharon/plugins/eap_sim_pcsc/Makefile.am
+++ b/src/libcharon/plugins/eap_sim_pcsc/Makefile.am
@@ -11,7 +11,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-sim-pcsc.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-sim-pcsc.la
-libstrongswan_eap_sim_pcsc_la_LIBADD += $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_sim_pcsc_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am b/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
index a8e03f6504e06a86e5cb3dfb9ad367aa76bdeaa2..f8761ba16112c4b9c9b87eceaa1f6a5e074353c4 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
+++ b/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
@@ -8,7 +8,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-pseudonym.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-simaka-pseudonym.la
-libstrongswan_eap_simaka_pseudonym_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_simaka_pseudonym_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_simaka_reauth/Makefile.am b/src/libcharon/plugins/eap_simaka_reauth/Makefile.am
index 0b35c7521691de316efcba41092915e261004a30..0191c9de6d728a2d5354d4d4962fb765183752d3 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_reauth/Makefile.am
+++ b/src/libcharon/plugins/eap_simaka_reauth/Makefile.am
@@ -8,7 +8,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-reauth.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-simaka-reauth.la
-libstrongswan_eap_simaka_reauth_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_simaka_reauth_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_simaka_sql/Makefile.am b/src/libcharon/plugins/eap_simaka_sql/Makefile.am
index c83267e677ec04da86e1c0e879ce2b3e0c741135..bc6a4e5f0c7d0cfe58de78c19670df2a9eb1a2ff 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_sql/Makefile.am
+++ b/src/libcharon/plugins/eap_simaka_sql/Makefile.am
@@ -8,7 +8,6 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-sql.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-simaka-sql.la
-libstrongswan_eap_simaka_sql_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_simaka_sql_la_SOURCES = \