Revert "fixed integrity tests of plugins using libsimaka"
authorTobias Brunner <tobias@strongswan.org>
Tue, 8 Nov 2011 11:04:50 +0000 (12:04 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 8 Nov 2011 17:35:11 +0000 (18:35 +0100)
This reverts commit 8c42f16deeeffa1ae305b18306b0796f49c9922c.

Conflicts:

src/charon/Makefile.am

src/charon/Makefile.am
src/libcharon/plugins/eap_aka/Makefile.am
src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
src/libcharon/plugins/eap_sim/Makefile.am
src/libcharon/plugins/eap_sim_file/Makefile.am
src/libcharon/plugins/eap_sim_pcsc/Makefile.am
src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
src/libcharon/plugins/eap_simaka_reauth/Makefile.am
src/libcharon/plugins/eap_simaka_sql/Makefile.am

index 42d4381..ce459f6 100644 (file)
@@ -26,9 +26,5 @@ if USE_LIBTNCCS
   charon_LDADD += $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
-if USE_SIMAKA
-  charon_LDADD += $(top_builddir)/src/libsimaka/libsimaka.la
-endif
-
 EXTRA_DIST = Android.mk
 
index 1e8af09..d37d169 100644 (file)
@@ -8,6 +8,7 @@ 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 = \
index c75c5f1..b4d6dc1 100644 (file)
@@ -11,6 +11,7 @@ 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 = \
index 408872c..a0cb72f 100644 (file)
@@ -8,6 +8,7 @@ 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 = \
index 0606550..d76cdc5 100644 (file)
@@ -8,6 +8,7 @@ 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 = \
index e973795..fae6fcc 100644 (file)
@@ -11,6 +11,7 @@ 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 = \
index f8761ba..a8e03f6 100644 (file)
@@ -8,6 +8,7 @@ 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 = \
index 0191c9d..0b35c75 100644 (file)
@@ -8,6 +8,7 @@ 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 = \
index bc6a4e5..c83267e 100644 (file)
@@ -8,6 +8,7 @@ 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 = \