]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
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 ce459f6478054796fbb3edb9f6db4449d958fbeb..6481947f15827d8a781c459133061781d54b25f9 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 9f7ec6a4dc75a9472988575135583ab555803e87..81f2575c73c7c42fb6d276b514f9a8527d810033 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 fb3de493721e74cd2af3ea79aaa8658cfa19ec38..29ddd822b695e4d9eea2f51ff2d8984fb564638a 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 0d5760b25e56f7b5cc6d3550587f3b2753bb061b..0e10f7d9c4eda80832c945c24668b497ab94100c 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 a06665d4c5ce8b1d94a2984cabb7a31d8726d54b..94ce5cc1ea5072bb431a662efaa316b48892baca 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 f282978a9918376f9952cbac211f8014b6519d7d..fc197952545dffb311bf13297ca05d019b3bacd6 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 0de287d922b827adb1949f9367072a3a1cb70508..eca3b377b3ae48d5c7d8949a95fe2ab369633598 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 bf77c4caea0f80c91ec9587d7927c7fc3d361b42..c7fc02f7c412a621257cb67d4c80270b59796380 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 b10c4019c2f35575952ce9cba8ea5806a1adbafb..c205692d449e66a6c149a8265ff50de123726cf3 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 f63e2656e8b6693fcfdb03baa5cd0035f1173280..ec17e64122dc7b89a4f2ef30e7c10576f0f33292 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 d9baee48a617e3c8b768ea1cdeae012f10ade409..57c2baaf0de9b95f6a3f4b4a96f706f556b82a94 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 = \