android: Remove/filter header files from LOCAL_SRC_FILES

This avoids huge warnings when building the native code.

diff --git a/src/frontends/android/jni/libandroidbridge/Android.mk b/src/frontends/android/jni/libandroidbridge/Android.mk
index b1fa4d1cb95aeb3c1905d1763cd28a91259ee47f..fbb86126e596672de27b79e0d6ab821599c9ea68 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/Android.mk
+++ b/src/frontends/android/jni/libandroidbridge/Android.mk
@@ -3,16 +3,16 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
 LOCAL_SRC_FILES := \
-android_jni.c android_jni.h \
-backend/android_attr.c backend/android_attr.h \
-backend/android_creds.c backend/android_creds.h \
-backend/android_private_key.c backend/android_private_key.h \
-backend/android_service.c backend/android_service.h \
-charonservice.c charonservice.h \
-kernel/android_ipsec.c kernel/android_ipsec.h \
-kernel/android_net.c kernel/android_net.h \
-kernel/network_manager.c kernel/network_manager.h \
-vpnservice_builder.c vpnservice_builder.h
+android_jni.c \
+backend/android_attr.c \
+backend/android_creds.c \
+backend/android_private_key.c \
+backend/android_service.c \
+charonservice.c \
+kernel/android_ipsec.c \
+kernel/android_net.c \
+kernel/network_manager.c \
+vpnservice_builder.c
 
 # build libandroidbridge -------------------------------------------------------
 

diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index a9319088fcd1d984578f7bd77fe2ef843227593d..66606f9372f36b52a2a8691bef80375fb0d00bf4 100644 (file)
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
+libcharon_la_SOURCES := \
 bus/bus.c bus/bus.h \
 bus/listeners/listener.h \
 bus/listeners/logger.h \
@@ -77,7 +77,7 @@ sa/shunt_manager.c sa/shunt_manager.h \
 sa/trap_manager.c sa/trap_manager.h \
 sa/task.c sa/task.h
 
-LOCAL_SRC_FILES += \
+libcharon_la_SOURCES += \
 sa/ikev2/keymat_v2.c sa/ikev2/keymat_v2.h \
 sa/ikev2/task_manager_v2.c sa/ikev2/task_manager_v2.h \
 sa/ikev2/authenticators/eap_authenticator.c sa/ikev2/authenticators/eap_authenticator.h \
@@ -100,7 +100,7 @@ sa/ikev2/tasks/ike_reauth.c sa/ikev2/tasks/ike_reauth.h \
 sa/ikev2/tasks/ike_auth_lifetime.c sa/ikev2/tasks/ike_auth_lifetime.h \
 sa/ikev2/tasks/ike_vendor.c sa/ikev2/tasks/ike_vendor.h
 
-LOCAL_SRC_FILES += \
+libcharon_la_SOURCES += \
 sa/ikev1/keymat_v1.c sa/ikev1/keymat_v1.h \
 sa/ikev1/task_manager_v1.c sa/ikev1/task_manager_v1.h \
 sa/ikev1/authenticators/psk_v1_authenticator.c sa/ikev1/authenticators/psk_v1_authenticator.h \
@@ -123,6 +123,8 @@ sa/ikev1/tasks/mode_config.c sa/ikev1/tasks/mode_config.h \
 processing/jobs/dpd_timeout_job.c processing/jobs/dpd_timeout_job.h \
 processing/jobs/adopt_children_job.c processing/jobs/adopt_children_job.h
 
+LOCAL_SRC_FILES := $(filter %.c,$(libcharon_la_SOURCES))
+
 # adding the plugin source files
 
 LOCAL_SRC_FILES += $(call add_plugin, android-dns)

diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk
index 075f8dbcb2d2cd3b77cd47ca81c54f3a120a4b00..429feed555e384db94fa5ab73d6bd833860566e8 100644 (file)
--- a/src/libhydra/Android.mk
+++ b/src/libhydra/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
+libhydra_la_SOURCES := \
 hydra.c hydra.h \
 attributes/attributes.c attributes/attributes.h \
 attributes/attribute_provider.h attributes/attribute_handler.h \
@@ -13,6 +13,8 @@ kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
 kernel/kernel_net.c kernel/kernel_net.h \
 kernel/kernel_listener.h
 
+LOCAL_SRC_FILES := $(filter %.c,$(libhydra_la_SOURCES))
+
 # adding the plugin source files
 
 LOCAL_SRC_FILES += $(call add_plugin, attr)

diff --git a/src/libipsec/Android.mk b/src/libipsec/Android.mk
index 81f4632ef9654c7b6ae8347fb034e0aa35dd9c78..37f400fc3005cae54d6e92c0d1e0c12b55bd88a4 100644 (file)
--- a/src/libipsec/Android.mk
+++ b/src/libipsec/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
+libipsec_la_SOURCES := \
 ipsec.c ipsec.h \
 esp_context.c esp_context.h \
 esp_packet.c esp_packet.h \
@@ -15,6 +15,8 @@ ipsec_processor.c ipsec_processor.h \
 ipsec_sa.c ipsec_sa.h \
 ipsec_sa_mgr.c ipsec_sa_mgr.h
 
+LOCAL_SRC_FILES := $(filter %.c,$(libipsec_la_SOURCES))
+
 # build libipsec ---------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \

diff --git a/src/libtnccs/Android.mk b/src/libtnccs/Android.mk
index a4bbc13f59dc8790546900748c7471c28c31b807..c8724dce2949b336793f530aa396a4d6959dbd9d 100644 (file)
--- a/src/libtnccs/Android.mk
+++ b/src/libtnccs/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
+libtnccs_la_SOURCES := \
 tnc/tnc.h tnc/tnc.c \
 tnc/imc/imc.h tnc/imc/imc_manager.h \
 tnc/imv/imv.h tnc/imv/imv_manager.h \
@@ -10,6 +10,8 @@ tnc/imv/imv_recommendations.h tnc/imv/imv_recommendations.c \
 tnc/tnccs/tnccs.h tnc/tnccs/tnccs.c \
 tnc/tnccs/tnccs_manager.h tnc/tnccs/tnccs_manager.c
 
+LOCAL_SRC_FILES := $(filter %.c,$(libtnccs_la_SOURCES))
+
 # build libtncif ---------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \

diff --git a/src/libtncif/Android.mk b/src/libtncif/Android.mk
index a337a0dcc23d073ed4fc6aca267993905c77d4fc..9a9bfa9ad3b4c703bd674de326997c6228089d62 100644 (file)
--- a/src/libtncif/Android.mk
+++ b/src/libtncif/Android.mk
@@ -2,11 +2,13 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
+libtncif_la_SOURCES := \
 tncif.h tncifimc.h tncifimv.h tncif_names.h tncif_names.c \
 tncif_identity.h tncif_identity.c \
 tncif_pa_subtypes.h tncif_pa_subtypes.c
 
+LOCAL_SRC_FILES := $(filter %.c,$(libtncif_la_SOURCES))
+
 # build libtncif ---------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \

diff --git a/src/scepclient/Android.mk b/src/scepclient/Android.mk
index ea637e78a41706f3031bd5f60f07d2932983007e..69413890f1cd52d58d040e83898b51ca00ab77b3 100644 (file)
--- a/src/scepclient/Android.mk
+++ b/src/scepclient/Android.mk
@@ -2,9 +2,11 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
+scepclient_SOURCES := \
 scepclient.c scep.c scep.h
 
+LOCAL_SRC_FILES := $(filter %.c,$(scepclient_SOURCES))
+
 # build scepclient -------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \

diff --git a/src/starter/Android.mk b/src/starter/Android.mk
index c7e81d284e88701287f7c09944cabe9a77b17efd..91575c9ba91652976cd5d39a830b5fc9b6ee00d1 100644 (file)
--- a/src/starter/Android.mk
+++ b/src/starter/Android.mk
@@ -2,13 +2,15 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am (update for LEX/YACC)
-LOCAL_SRC_FILES := \
+starter_SOURCES := \
 parser.c lexer.c ipsec-parser.h netkey.c args.h netkey.h \
 starterstroke.c confread.c \
 starterstroke.h confread.h args.c \
 keywords.c files.h keywords.h cmp.c starter.c cmp.h invokecharon.c \
 invokecharon.h klips.c klips.h
 
+LOCAL_SRC_FILES := $(filter %.c,$(starter_SOURCES))
+
 # build starter ----------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \

diff --git a/src/stroke/Android.mk b/src/stroke/Android.mk
index 69b3e54ca7b2f46b8917fd34be5eeea3777b67b7..320314c4d409b565278c390876e23814f692f51a 100644 (file)
--- a/src/stroke/Android.mk
+++ b/src/stroke/Android.mk
@@ -2,9 +2,11 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
+stroke_SOURCES := \
 stroke.c stroke_msg.h stroke_keywords.c stroke_keywords.h
 
+LOCAL_SRC_FILES := $(filter %.c,$(stroke_SOURCES))
+
 # build stroke -----------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \