Revert "fixed integrity tests of plugins using libtls or libtnccs"
This reverts commit b597ac4a4c
(not
completely).
This commit is contained in:
parent
e034cc9ca9
commit
48e87e12ab
|
@ -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
|
||||
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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 = \
|
||||
|
|
Loading…
Reference in New Issue