From 8c42f16deeeffa1ae305b18306b0796f49c9922c Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Thu, 3 Nov 2011 22:04:36 +0100 Subject: [PATCH] fixed integrity tests of plugins using libsimaka --- src/charon/Makefile.am | 4 ++++ src/libcharon/plugins/eap_aka/Makefile.am | 1 - src/libcharon/plugins/eap_aka_3gpp2/Makefile.am | 1 - src/libcharon/plugins/eap_sim/Makefile.am | 1 - src/libcharon/plugins/eap_sim_file/Makefile.am | 1 - src/libcharon/plugins/eap_sim_pcsc/Makefile.am | 1 - src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am | 1 - src/libcharon/plugins/eap_simaka_reauth/Makefile.am | 1 - src/libcharon/plugins/eap_simaka_sql/Makefile.am | 1 - 9 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am index ce459f6478..4d2fd655cc 100644 --- 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 d37d1691ca..1e8af09f8a 100644 --- 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 b4d6dc1d22..c75c5f1bec 100644 --- 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 a0cb72f5f2..408872c5e3 100644 --- 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 d76cdc5caf..0606550a9f 100644 --- 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 fae6fccfca..e97379550a 100644 --- 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 a8e03f6504..f8761ba161 100644 --- 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 0b35c75216..0191c9de6d 100644 --- 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 c83267e677..bc6a4e5f0c 100644 --- 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 = \ -- 2.47.2