From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 20 Sep 2013 09:16:21 +0000 (+0200)
Subject: android: Several plugins were moved from libcharon to libtnccs
X-Git-Tag: 5.1.1dr4~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3f64a79c24ca89745fc2ffbf5ad54b2bc26a641;p=thirdparty%2Fstrongswan.git

android: Several plugins were moved from libcharon to libtnccs

These were moved in commits e8f65c5cde and 12b3db5006.
---

diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index 75cf74fa45..0fe88efb4e 100644
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -187,6 +187,10 @@ endif
 LOCAL_SRC_FILES += $(call add_plugin, eap-peap)
 
 LOCAL_SRC_FILES += $(call add_plugin, eap-tnc)
+ifneq ($(call plugin_enabled, eap-tnc),)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtnccs/ $(LOCAL_PATH)/../libtncif/
+LOCAL_SHARED_LIBRARIES += libtnccs libtncif
+endif
 
 # adding libtls if any of the four plugins above is enabled
 ifneq ($(or $(call plugin_enabled, eap-tls), $(call plugin_enabled, eap-ttls), \
@@ -210,41 +214,13 @@ ifneq ($(call plugin_enabled, stroke),)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stroke/
 endif
 
-LOCAL_SRC_FILES += $(call add_plugin, tnc-imc)
-ifneq ($(call plugin_enabled, tnc-imc),)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, tnc-tnccs)
-
-LOCAL_SRC_FILES += $(call add_plugin, tnccs-20)
-LOCAL_SRC_FILES += $(call add_plugin_subdirs, tnccs-20, batch messages state_machine)
-ifneq ($(call plugin_enabled, tnccs-20),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/plugins/tnccs_20/
-# for tls.h
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtls/
-endif
-
-ifneq ($(or $(call plugin_enabled, eap-tnc), $(call plugin_enabled, tnc-imc), \
-			$(call plugin_enabled, tnc-tnccs), $(call plugin_enabled, tnccs-20)),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtnccs/
-LOCAL_SHARED_LIBRARIES += libtnccs
-endif
-
-ifneq ($(or $(call plugin_enabled, tnc-imc), $(call plugin_enabled, tnc-tnccs), \
-			$(call plugin_enabled, tnccs-20)),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtncif/
-LOCAL_SHARED_LIBRARIES += libtncif
-endif
-
 # build libcharon --------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \
 	$(libvstr_PATH) \
 	$(strongswan_PATH)/src/include \
 	$(strongswan_PATH)/src/libhydra \
-	$(strongswan_PATH)/src/libstrongswan \
-	$(strongswan_PATH)/src/libtncif
+	$(strongswan_PATH)/src/libstrongswan
 
 LOCAL_CFLAGS := $(strongswan_CFLAGS)
 
diff --git a/src/libtnccs/Android.mk b/src/libtnccs/Android.mk
index ad12e754d6..4d2803a97a 100644
--- a/src/libtnccs/Android.mk
+++ b/src/libtnccs/Android.mk
@@ -12,6 +12,26 @@ tnc/tnccs/tnccs_manager.h tnc/tnccs/tnccs_manager.c
 
 LOCAL_SRC_FILES := $(filter %.c,$(libtnccs_la_SOURCES))
 
+# adding the plugin source files
+
+LOCAL_SRC_FILES += $(call add_plugin, tnc-imc)
+ifneq ($(call plugin_enabled, tnc-imc),)
+LOCAL_SHARED_LIBRARIES += libdl
+endif
+
+LOCAL_SRC_FILES += $(call add_plugin, tnc-tnccs)
+
+LOCAL_SRC_FILES += $(call add_plugin, tnccs-20)
+LOCAL_SRC_FILES += $(call add_plugin_subdirs, tnccs-20, batch messages messages/ietf messages/tcg state_machine)
+ifneq ($(call plugin_enabled, tnccs-20),)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/plugins/tnccs_20/
+endif
+
+ifneq ($(or $(call plugin_enabled, tnc-imc), $(call plugin_enabled, tnc-tnccs), \
+			$(call plugin_enabled, tnccs-20)),)
+LOCAL_SHARED_LIBRARIES += libtncif
+endif
+
 # build libtncif ---------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \