Use wildcards to gather plugin source files.

2 files changed, 60 insertions, 177 deletions

diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index 8e0d4e624..bb6d1e22b 100644
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -102,79 +102,38 @@ LOCAL_SRC_FILES := \
 	credentials/sets/cert_cache.c credentials/sets/cert_cache.h \
 	credentials/credential_set.h
 
-# adding the plugin source files (copy-n-paste from Makefile.am)
+# adding the plugin source files
 
-LOCAL_SRC_FILES += $(call add_plugin, android, \
-	android_plugin.c android_plugin.h \
-	android_handler.c android_handler.h \
-)
+LOCAL_SRC_FILES += $(call add_plugin, android)
 ifneq ($(call plugin_enabled, android)),)
 LOCAL_SHARED_LIBRARIES += libcutils
 endif
 
-LOCAL_SRC_FILES += $(call add_plugin, attr, \
-	attr_plugin.h attr_plugin.c \
-	attr_provider.h attr_provider.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-aka, \
-	eap_aka_plugin.h eap_aka_plugin.c \
-	eap_aka_peer.h eap_aka_peer.c \
-	eap_aka_server.h eap_aka_server.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-aka-3gpp2, \
-	eap_aka_3gpp2_plugin.h eap_aka_3gpp2_plugin.c \
-	eap_aka_3gpp2_card.h eap_aka_3gpp2_card.c \
-	eap_aka_3gpp2_provider.h eap_aka_3gpp2_provider.c \
-	eap_aka_3gpp2_functions.h eap_aka_3gpp2_functions.c \
-)
+LOCAL_SRC_FILES += $(call add_plugin, attr)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-aka)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-aka-3gpp2)
 ifneq ($(call plugin_enabled, eap-aka-3gpp2)),)
 LOCAL_C_INCLUDES += $(libgmp_PATH)
 LOCAL_STATIC_LIBRARIES += libgmp
 endif
 
-LOCAL_SRC_FILES += $(call add_plugin, eap-gtc, \
-	eap_gtc_plugin.h eap_gtc_plugin.c eap_gtc.h eap_gtc.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-identity, \
-	eap_identity_plugin.h eap_identity_plugin.c eap_identity.h eap_identity.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-md5, \
-	eap_md5_plugin.h eap_md5_plugin.c eap_md5.h eap_md5.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-mschapv2, \
-	eap_mschapv2_plugin.h eap_mschapv2_plugin.c \
-	eap_mschapv2.h eap_mschapv2.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-sim, \
-	eap_sim_plugin.h eap_sim_plugin.c \
-	eap_sim_peer.h eap_sim_peer.c \
-	eap_sim_server.h eap_sim_server.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-simaka-pseudonym, \
-	eap_simaka_pseudonym_plugin.h eap_simaka_pseudonym_plugin.c \
-	eap_simaka_pseudonym_card.h eap_simaka_pseudonym_card.c \
-	eap_simaka_pseudonym_provider.h eap_simaka_pseudonym_provider.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-simaka-reauth, \
-	eap_simaka_reauth_plugin.h eap_simaka_reauth_plugin.c \
-	eap_simaka_reauth_card.h eap_simaka_reauth_card.c \
-	eap_simaka_reauth_provider.h eap_simaka_reauth_provider.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-sim-file, \
-	eap_sim_file_plugin.h eap_sim_file_plugin.c \
-	eap_sim_file_card.h eap_sim_file_card.c \
-	eap_sim_file_provider.h eap_sim_file_provider.c \
-	eap_sim_file_triplets.h eap_sim_file_triplets.c \
-)
+LOCAL_SRC_FILES += $(call add_plugin, eap-gtc)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-identity)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-md5)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-mschapv2)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-sim)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-simaka-pseudonym)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-simaka-reauth)
+
+LOCAL_SRC_FILES += $(call add_plugin, eap-sim-file)
 
 # adding libakasim if either eap-aka or eap-sim is enabled
 ifneq ($(or $(call plugin_enabled, eap-aka), $(call plugin_enabled, eap-sim)),)
@@ -185,30 +144,13 @@ LOCAL_SRC_FILES += $(addprefix ../libsimaka/, \
 	)
 endif
 
-LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink, \
-	kernel_netlink_plugin.h kernel_netlink_plugin.c \
-	kernel_netlink_ipsec.h kernel_netlink_ipsec.c kernel_netlink_net.h kernel_netlink_net.c \
-	kernel_netlink_shared.h kernel_netlink_shared.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, load-tester, \
-	load_tester_plugin.c load_tester_plugin.h \
-	load_tester_config.c load_tester_config.h \
-	load_tester_creds.c load_tester_creds.h \
-	load_tester_ipsec.c load_tester_ipsec.h \
-	load_tester_listener.c load_tester_listener.h \
-	load_tester_diffie_hellman.c load_tester_diffie_hellman.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, socket-default, \
-	socket_default_socket.h socket_default_socket.c \
-	socket_default_plugin.h socket_default_plugin.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic, \
-	socket_dynamic_plugin.h socket_dynamic_plugin.c \
-	socket_dynamic_socket.h socket_dynamic_socket.c \
-)
+LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink)
+
+LOCAL_SRC_FILES += $(call add_plugin, load-tester)
+
+LOCAL_SRC_FILES += $(call add_plugin, socket-default)
+
+LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic)
 
 # build libcharon --------------------------------------------------------------
 
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 776eeff64..67a78c738 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -62,106 +62,47 @@ LOCAL_SRC_FILES := \
 	utils/backtrace.c utils/backtrace.h \
 	plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
 
-# adding the plugin source files (copy-n-paste from their Makefile.am)
-
-LOCAL_SRC_FILES += $(call add_plugin, aes, \
-	aes_plugin.h aes_plugin.c aes_crypter.c aes_crypter.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, des, \
-	des_plugin.h des_plugin.c des_crypter.c des_crypter.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, fips-prf, \
-	fips_prf_plugin.h fips_prf_plugin.c fips_prf.c fips_prf.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, gmp, \
-	gmp_plugin.h gmp_plugin.c \
-	gmp_diffie_hellman.c gmp_diffie_hellman.h \
-	gmp_rsa_private_key.c gmp_rsa_private_key.h \
-	gmp_rsa_public_key.c gmp_rsa_public_key.h \
-)
+# adding the plugin source files
+
+LOCAL_SRC_FILES += $(call add_plugin, aes)
+
+LOCAL_SRC_FILES += $(call add_plugin, des)
+
+LOCAL_SRC_FILES += $(call add_plugin, fips-prf)
+
+LOCAL_SRC_FILES += $(call add_plugin, gmp)
 ifneq ($(call plugin_enabled, gmp)),)
 LOCAL_C_INCLUDES += $(libgmp_PATH)
 LOCAL_STATIC_LIBRARIES += libgmp
 endif
 
-LOCAL_SRC_FILES += $(call add_plugin, hmac, \
-	hmac_plugin.h hmac_plugin.c hmac.h hmac.c \
-	hmac_prf.h hmac_prf.c hmac_signer.h hmac_signer.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, md4, \
-	md4_plugin.h md4_plugin.c md4_hasher.c md4_hasher.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, md5, \
-	md5_plugin.h md5_plugin.c md5_hasher.c md5_hasher.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, openssl, \
-	openssl_plugin.h openssl_plugin.c \
-	openssl_util.c openssl_util.h \
-	openssl_crypter.c openssl_crypter.h \
-	openssl_hasher.c openssl_hasher.h \
-	openssl_sha1_prf.c openssl_sha1_prf.h \
-	openssl_diffie_hellman.c openssl_diffie_hellman.h \
-	openssl_rsa_private_key.c openssl_rsa_private_key.h \
-	openssl_rsa_public_key.c openssl_rsa_public_key.h \
-	openssl_ec_diffie_hellman.c openssl_ec_diffie_hellman.h \
-	openssl_ec_private_key.c openssl_ec_private_key.h \
-	openssl_ec_public_key.c openssl_ec_public_key.h \
-)
+LOCAL_SRC_FILES += $(call add_plugin, hmac)
+
+LOCAL_SRC_FILES += $(call add_plugin, md4)
+
+LOCAL_SRC_FILES += $(call add_plugin, md5)
+
+LOCAL_SRC_FILES += $(call add_plugin, openssl)
 ifneq ($(call plugin_enabled, openssl)),)
 LOCAL_C_INCLUDES += external/openssl/include
 LOCAL_SHARED_LIBRARIES += libcrypto
 endif
 
-LOCAL_SRC_FILES += $(call add_plugin, pem, \
-	pem_plugin.h pem_plugin.c \
-	pem_builder.c pem_builder.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, pkcs1, \
-	pkcs1_plugin.h pkcs1_plugin.c \
-	pkcs1_encoder.h pkcs1_encoder.c \
-	pkcs1_builder.h pkcs1_builder.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, pubkey, \
-	pubkey_plugin.h pubkey_plugin.c \
-	pubkey_cert.h pubkey_cert.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, random, \
-	random_plugin.h random_plugin.c \
-	random_rng.c random_rng.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, sha1, \
-	sha1_plugin.h sha1_plugin.c \
-	sha1_hasher.c sha1_hasher.h sha1_prf.c sha1_prf.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, sha2, \
-	sha2_plugin.h sha2_plugin.c sha2_hasher.c sha2_hasher.h \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, x509, \
-	x509_plugin.h x509_plugin.c \
-	x509_cert.h x509_cert.c \
-	x509_crl.h x509_crl.c \
-	x509_ac.h x509_ac.c \
-	x509_pkcs10.h x509_pkcs10.c \
-	x509_ocsp_request.h x509_ocsp_request.c \
-	x509_ocsp_response.h x509_ocsp_response.c \
-)
-
-LOCAL_SRC_FILES += $(call add_plugin, xcbc, \
-	xcbc_plugin.h xcbc_plugin.c xcbc.h xcbc.c \
-	xcbc_prf.h xcbc_prf.c xcbc_signer.h xcbc_signer.c \
-)
+LOCAL_SRC_FILES += $(call add_plugin, pem)
+
+LOCAL_SRC_FILES += $(call add_plugin, pkcs1)
+
+LOCAL_SRC_FILES += $(call add_plugin, pubkey)
+
+LOCAL_SRC_FILES += $(call add_plugin, random)
+
+LOCAL_SRC_FILES += $(call add_plugin, sha1)
+
+LOCAL_SRC_FILES += $(call add_plugin, sha2)
+
+LOCAL_SRC_FILES += $(call add_plugin, x509)
+
+LOCAL_SRC_FILES += $(call add_plugin, xcbc)
 
 # build libstrongswan ----------------------------------------------------------