Revert "fixed integrity tests of plugins using libtls or libtnccs"
authorTobias Brunner <tobias@strongswan.org>
Tue, 8 Nov 2011 11:08:00 +0000 (12:08 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 8 Nov 2011 17:35:11 +0000 (18:35 +0100)
This reverts commit b597ac4a4cbcd9197b886d743c75d58293264580 (not
completely).

src/charon/Makefile.am
src/libcharon/plugins/eap_peap/Makefile.am
src/libcharon/plugins/eap_tls/Makefile.am
src/libcharon/plugins/eap_tnc/Makefile.am
src/libcharon/plugins/eap_ttls/Makefile.am
src/libcharon/plugins/tnc_imc/Makefile.am
src/libcharon/plugins/tnc_imv/Makefile.am
src/libcharon/plugins/tnc_tnccs/Makefile.am
src/libcharon/plugins/tnccs_11/Makefile.am
src/libcharon/plugins/tnccs_20/Makefile.am
src/libcharon/plugins/tnccs_dynamic/Makefile.am

index ce459f6..6481947 100644 (file)
@@ -18,13 +18,5 @@ charon_LDADD = \
        $(top_builddir)/src/libcharon/libcharon.la \
        -lm $(PTHREADLIB) $(DLLIB)
 
-if USE_TLS
-  charon_LDADD += $(top_builddir)/src/libtls/libtls.la
-endif
-
-if USE_LIBTNCCS
-  charon_LDADD += $(top_builddir)/src/libtnccs/libtnccs.la
-endif
-
 EXTRA_DIST = Android.mk
 
index 9f7ec6a..81f2575 100644 (file)
@@ -8,6 +8,7 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-peap.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-peap.la
+libstrongswan_eap_peap_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
 endif
 
 libstrongswan_eap_peap_la_SOURCES = \
index fb3de49..29ddd82 100644 (file)
@@ -8,6 +8,7 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-tls.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-tls.la
+libstrongswan_eap_tls_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
 endif
 
 libstrongswan_eap_tls_la_SOURCES = \
index 0d5760b..0e10f7d 100644 (file)
@@ -13,6 +13,9 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-tnc.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-tnc.la
+libstrongswan_eap_tnc_la_LIBADD = \
+       $(top_builddir)/src/libtls/libtls.la \
+       $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_eap_tnc_la_SOURCES = \
index a06665d..94ce5cc 100644 (file)
@@ -8,6 +8,7 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-ttls.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-ttls.la
+libstrongswan_eap_ttls_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
 endif
 
 libstrongswan_eap_ttls_la_SOURCES = \
index f282978..fc19795 100644 (file)
@@ -11,7 +11,8 @@ noinst_LTLIBRARIES = libstrongswan-tnc-imc.la
 else
 plugin_LTLIBRARIES = libstrongswan-tnc-imc.la
 libstrongswan_tnc_imc_la_LIBADD = \
-       $(top_builddir)/src/libtncif/libtncif.la
+       $(top_builddir)/src/libtncif/libtncif.la \
+       $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_tnc_imc_la_SOURCES = \
index 0de287d..eca3b37 100644 (file)
@@ -13,7 +13,8 @@ noinst_LTLIBRARIES = libstrongswan-tnc-imv.la
 else
 plugin_LTLIBRARIES = libstrongswan-tnc-imv.la
 libstrongswan_tnc_imv_la_LIBADD = \
-       $(top_builddir)/src/libtncif/libtncif.la
+       $(top_builddir)/src/libtncif/libtncif.la \
+       $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_tnc_imv_la_SOURCES = \
index bf77c4c..c7fc02f 100644 (file)
@@ -11,7 +11,8 @@ noinst_LTLIBRARIES = libstrongswan-tnc-tnccs.la
 else
 plugin_LTLIBRARIES = libstrongswan-tnc-tnccs.la
 libstrongswan_tnc_tnccs_la_LIBADD = \
-       $(top_builddir)/src/libtncif/libtncif.la
+       $(top_builddir)/src/libtncif/libtncif.la \
+       $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_tnc_tnccs_la_SOURCES = \
index b10c401..c205692 100644 (file)
@@ -15,7 +15,8 @@ noinst_LTLIBRARIES = libstrongswan-tnccs-11.la
 else
 plugin_LTLIBRARIES = libstrongswan-tnccs-11.la
 libstrongswan_tnccs_11_la_LIBADD += \
-       $(top_builddir)/src/libtncif/libtncif.la
+       $(top_builddir)/src/libtncif/libtncif.la \
+       $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_tnccs_11_la_SOURCES = \
index f63e265..ec17e64 100644 (file)
@@ -12,7 +12,8 @@ noinst_LTLIBRARIES = libstrongswan-tnccs-20.la
 else
 plugin_LTLIBRARIES = libstrongswan-tnccs-20.la
 libstrongswan_tnccs_20_la_LIBADD = \
-       $(top_builddir)/src/libtncif/libtncif.la
+       $(top_builddir)/src/libtncif/libtncif.la \
+       $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_tnccs_20_la_SOURCES = \
index d9baee4..57c2baa 100644 (file)
@@ -12,7 +12,8 @@ noinst_LTLIBRARIES = libstrongswan-tnccs-dynamic.la
 else
 plugin_LTLIBRARIES = libstrongswan-tnccs-dynamic.la
 libstrongswan_tnccs_dynamic_la_LIBADD = \
-       $(top_builddir)/src/libtncif/libtncif.la
+       $(top_builddir)/src/libtncif/libtncif.la \
+       $(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_tnccs_dynamic_la_SOURCES = \