Streamlined the source file list formatting in plugin makefiles.

56 files changed, 220 insertions, 139 deletions

diff --git a/src/charon/plugins/android/Makefile.am b/src/charon/plugins/android/Makefile.am
index 065704b2a..1e428b07a 100644
--- a/src/charon/plugins/android/Makefile.am
+++ b/src/charon/plugins/android/Makefile.am
@@ -12,8 +12,8 @@ libstrongswan_android_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswa
 endif
 
 libstrongswan_android_la_SOURCES = \
-  android_plugin.c android_plugin.h \
-  android_handler.c android_handler.h
+	android_plugin.c android_plugin.h \
+	android_handler.c android_handler.h
 
 libstrongswan_android_la_LDFLAGS = -module -avoid-version
 libstrongswan_android_la_LIBADD += -lcutils
diff --git a/src/charon/plugins/attr/Makefile.am b/src/charon/plugins/attr/Makefile.am
index 4262d2a25..98d9694ca 100644
--- a/src/charon/plugins/attr/Makefile.am
+++ b/src/charon/plugins/attr/Makefile.am
@@ -10,6 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-attr.la
 libstrongswan_attr_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_attr_la_SOURCES = attr_plugin.h attr_plugin.c \
-  attr_provider.h attr_provider.c
+libstrongswan_attr_la_SOURCES = \
+	attr_plugin.h attr_plugin.c \
+	attr_provider.h attr_provider.c
+
 libstrongswan_attr_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_aka/Makefile.am b/src/charon/plugins/eap_aka/Makefile.am
index a97bbf893..ddeacc5f0 100644
--- a/src/charon/plugins/eap_aka/Makefile.am
+++ b/src/charon/plugins/eap_aka/Makefile.am
@@ -11,7 +11,9 @@ plugin_LTLIBRARIES = libstrongswan-eap-aka.la
 libstrongswan_eap_aka_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
-libstrongswan_eap_aka_la_SOURCES = eap_aka_plugin.h eap_aka_plugin.c \
-  eap_aka_peer.h eap_aka_peer.c \
-  eap_aka_server.h eap_aka_server.c
+libstrongswan_eap_aka_la_SOURCES = \
+	eap_aka_plugin.h eap_aka_plugin.c \
+	eap_aka_peer.h eap_aka_peer.c \
+	eap_aka_server.h eap_aka_server.c
+
 libstrongswan_eap_aka_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_aka_3gpp2/Makefile.am b/src/charon/plugins/eap_aka_3gpp2/Makefile.am
index 98ead2200..5a3766957 100644
--- a/src/charon/plugins/eap_aka_3gpp2/Makefile.am
+++ b/src/charon/plugins/eap_aka_3gpp2/Makefile.am
@@ -12,9 +12,10 @@ libstrongswan_eap_aka_3gpp2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstr
 endif
 
 libstrongswan_eap_aka_3gpp2_la_SOURCES = \
-  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
+	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
+
 libstrongswan_eap_aka_3gpp2_la_LDFLAGS = -module -avoid-version
 libstrongswan_eap_aka_3gpp2_la_LIBADD += -lgmp
diff --git a/src/charon/plugins/eap_gtc/Makefile.am b/src/charon/plugins/eap_gtc/Makefile.am
index 83fd0de7e..8f0fea76d 100644
--- a/src/charon/plugins/eap_gtc/Makefile.am
+++ b/src/charon/plugins/eap_gtc/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-eap-gtc.la
 libstrongswan_eap_gtc_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_eap_gtc_la_SOURCES = eap_gtc_plugin.h eap_gtc_plugin.c eap_gtc.h eap_gtc.c
+libstrongswan_eap_gtc_la_SOURCES = \
+	eap_gtc_plugin.h eap_gtc_plugin.c eap_gtc.h eap_gtc.c
+
 libstrongswan_eap_gtc_la_LDFLAGS = -module -avoid-version -lpam
diff --git a/src/charon/plugins/eap_identity/Makefile.am b/src/charon/plugins/eap_identity/Makefile.am
index 0b0c358e7..428ad396b 100644
--- a/src/charon/plugins/eap_identity/Makefile.am
+++ b/src/charon/plugins/eap_identity/Makefile.am
@@ -11,5 +11,6 @@ libstrongswan_eap_identity_la_LIBADD = $(top_builddir)/src/libstrongswan/libstro
 endif
 
 libstrongswan_eap_identity_la_SOURCES = \
-  eap_identity_plugin.h eap_identity_plugin.c eap_identity.h eap_identity.c
+	eap_identity_plugin.h eap_identity_plugin.c eap_identity.h eap_identity.c
+
 libstrongswan_eap_identity_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_md5/Makefile.am b/src/charon/plugins/eap_md5/Makefile.am
index 7b6c20ce8..838b1f474 100644
--- a/src/charon/plugins/eap_md5/Makefile.am
+++ b/src/charon/plugins/eap_md5/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-eap-md5.la
 libstrongswan_eap_md5_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_eap_md5_la_SOURCES = eap_md5_plugin.h eap_md5_plugin.c eap_md5.h eap_md5.c
+libstrongswan_eap_md5_la_SOURCES = \
+	eap_md5_plugin.h eap_md5_plugin.c eap_md5.h eap_md5.c
+
 libstrongswan_eap_md5_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_mschapv2/Makefile.am b/src/charon/plugins/eap_mschapv2/Makefile.am
index c0efe579a..08c862cd8 100644
--- a/src/charon/plugins/eap_mschapv2/Makefile.am
+++ b/src/charon/plugins/eap_mschapv2/Makefile.am
@@ -13,4 +13,5 @@ endif
 libstrongswan_eap_mschapv2_la_SOURCES = \
 	eap_mschapv2_plugin.h eap_mschapv2_plugin.c \
 	eap_mschapv2.h eap_mschapv2.c
+
 libstrongswan_eap_mschapv2_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_radius/Makefile.am b/src/charon/plugins/eap_radius/Makefile.am
index 6432d86e5..f9e37a7db 100644
--- a/src/charon/plugins/eap_radius/Makefile.am
+++ b/src/charon/plugins/eap_radius/Makefile.am
@@ -11,8 +11,9 @@ libstrongswan_eap_radius_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrong
 endif
 
 libstrongswan_eap_radius_la_SOURCES = \
-  eap_radius_plugin.h eap_radius_plugin.c \
-  eap_radius.h eap_radius.c \
-  radius_client.h radius_client.c \
-  radius_message.h radius_message.c
+	eap_radius_plugin.h eap_radius_plugin.c \
+	eap_radius.h eap_radius.c \
+	radius_client.h radius_client.c \
+	radius_message.h radius_message.c
+
 libstrongswan_eap_radius_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_sim/Makefile.am b/src/charon/plugins/eap_sim/Makefile.am
index 96cd724da..82e8ba7aa 100644
--- a/src/charon/plugins/eap_sim/Makefile.am
+++ b/src/charon/plugins/eap_sim/Makefile.am
@@ -11,6 +11,9 @@ plugin_LTLIBRARIES = libstrongswan-eap-sim.la
 libstrongswan_eap_sim_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
-libstrongswan_eap_sim_la_SOURCES = eap_sim_plugin.h eap_sim_plugin.c \
-  eap_sim_peer.h eap_sim_peer.c \
-  eap_sim_server.h eap_sim_server.c
+libstrongswan_eap_sim_la_SOURCES = \
+	eap_sim_plugin.h eap_sim_plugin.c \
+	eap_sim_peer.h eap_sim_peer.c \
+	eap_sim_server.h eap_sim_server.c
+
+libstrongswan_eap_sim_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_sim_file/Makefile.am b/src/charon/plugins/eap_sim_file/Makefile.am
index a231908aa..80c3f2374 100644
--- a/src/charon/plugins/eap_sim_file/Makefile.am
+++ b/src/charon/plugins/eap_sim_file/Makefile.am
@@ -11,8 +11,9 @@ libstrongswan_eap_sim_file_la_LIBADD = $(top_builddir)/src/libstrongswan/libstro
 endif
 
 libstrongswan_eap_sim_file_la_SOURCES = \
-  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
+	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
+
 libstrongswan_eap_sim_file_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_simaka_pseudonym/Makefile.am b/src/charon/plugins/eap_simaka_pseudonym/Makefile.am
index bce0a53e1..ce131471b 100644
--- a/src/charon/plugins/eap_simaka_pseudonym/Makefile.am
+++ b/src/charon/plugins/eap_simaka_pseudonym/Makefile.am
@@ -11,7 +11,8 @@ libstrongswan_eap_simaka_pseudonym_la_LIBADD = $(top_builddir)/src/libstrongswan
 endif
 
 libstrongswan_eap_simaka_pseudonym_la_SOURCES = \
-  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
+	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
+
 libstrongswan_eap_simaka_pseudonym_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/eap_simaka_reauth/Makefile.am b/src/charon/plugins/eap_simaka_reauth/Makefile.am
index abb7b6648..958792555 100644
--- a/src/charon/plugins/eap_simaka_reauth/Makefile.am
+++ b/src/charon/plugins/eap_simaka_reauth/Makefile.am
@@ -11,7 +11,8 @@ libstrongswan_eap_simaka_reauth_la_LIBADD = $(top_builddir)/src/libstrongswan/li
 endif
 
 libstrongswan_eap_simaka_reauth_la_SOURCES = \
-  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
+	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
+
 libstrongswan_eap_simaka_reauth_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/kernel_klips/Makefile.am b/src/charon/plugins/kernel_klips/Makefile.am
index 27bf8f9ad..e8d31c51d 100644
--- a/src/charon/plugins/kernel_klips/Makefile.am
+++ b/src/charon/plugins/kernel_klips/Makefile.am
@@ -10,6 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-kernel-klips.la
 libstrongswan_kernel_klips_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_kernel_klips_la_SOURCES = kernel_klips_plugin.h kernel_klips_plugin.c \
+libstrongswan_kernel_klips_la_SOURCES = \
+	kernel_klips_plugin.h kernel_klips_plugin.c \
 	kernel_klips_ipsec.h kernel_klips_ipsec.c pfkeyv2.h
+
 libstrongswan_kernel_klips_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/kernel_netlink/Makefile.am b/src/charon/plugins/kernel_netlink/Makefile.am
index 8edf5b7c7..c768cd563 100644
--- a/src/charon/plugins/kernel_netlink/Makefile.am
+++ b/src/charon/plugins/kernel_netlink/Makefile.am
@@ -12,7 +12,9 @@ plugin_LTLIBRARIES = libstrongswan-kernel-netlink.la
 libstrongswan_kernel_netlink_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_kernel_netlink_la_SOURCES = kernel_netlink_plugin.h kernel_netlink_plugin.c \
+libstrongswan_kernel_netlink_la_SOURCES = \
+	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
+
 libstrongswan_kernel_netlink_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/kernel_pfkey/Makefile.am b/src/charon/plugins/kernel_pfkey/Makefile.am
index e9fe358c0..f621404ef 100644
--- a/src/charon/plugins/kernel_pfkey/Makefile.am
+++ b/src/charon/plugins/kernel_pfkey/Makefile.am
@@ -10,6 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-kernel-pfkey.la
 libstrongswan_kernel_pfkey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_kernel_pfkey_la_SOURCES = kernel_pfkey_plugin.h kernel_pfkey_plugin.c \
+libstrongswan_kernel_pfkey_la_SOURCES = \
+	kernel_pfkey_plugin.h kernel_pfkey_plugin.c \
 	kernel_pfkey_ipsec.h kernel_pfkey_ipsec.c
+
 libstrongswan_kernel_pfkey_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/kernel_pfroute/Makefile.am b/src/charon/plugins/kernel_pfroute/Makefile.am
index c47daf617..b5249a92b 100644
--- a/src/charon/plugins/kernel_pfroute/Makefile.am
+++ b/src/charon/plugins/kernel_pfroute/Makefile.am
@@ -10,6 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-kernel-pfroute.la
 libstrongswan_kernel_pfroute_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_kernel_pfroute_la_SOURCES = kernel_pfroute_plugin.h kernel_pfroute_plugin.c \
+libstrongswan_kernel_pfroute_la_SOURCES = \
+	kernel_pfroute_plugin.h kernel_pfroute_plugin.c \
 	kernel_pfroute_net.h kernel_pfroute_net.c
+
 libstrongswan_kernel_pfroute_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/load_tester/Makefile.am b/src/charon/plugins/load_tester/Makefile.am
index 3e25bb175..cc2c6fc55 100644
--- a/src/charon/plugins/load_tester/Makefile.am
+++ b/src/charon/plugins/load_tester/Makefile.am
@@ -11,11 +11,11 @@ libstrongswan_load_tester_la_LIBADD = $(top_builddir)/src/libstrongswan/libstron
 endif
 
 libstrongswan_load_tester_la_SOURCES = \
-  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
+	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
 
 libstrongswan_load_tester_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/medcli/Makefile.am b/src/charon/plugins/medcli/Makefile.am
index c6351a7eb..acfa3190d 100644
--- a/src/charon/plugins/medcli/Makefile.am
+++ b/src/charon/plugins/medcli/Makefile.am
@@ -10,8 +10,10 @@ plugin_LTLIBRARIES = libstrongswan-medcli.la
 libstrongswan_medcli_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_medcli_la_SOURCES = medcli_plugin.h medcli_plugin.c \
-			      medcli_creds.h medcli_creds.c \
-			      medcli_config.h medcli_config.c \
-			      medcli_listener.h medcli_listener.c
+libstrongswan_medcli_la_SOURCES = \
+	medcli_plugin.h medcli_plugin.c \
+	medcli_creds.h medcli_creds.c \
+	medcli_config.h medcli_config.c \
+	medcli_listener.h medcli_listener.c
+
 libstrongswan_medcli_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/medsrv/Makefile.am b/src/charon/plugins/medsrv/Makefile.am
index da387196b..9f547631e 100644
--- a/src/charon/plugins/medsrv/Makefile.am
+++ b/src/charon/plugins/medsrv/Makefile.am
@@ -10,7 +10,9 @@ plugin_LTLIBRARIES = libstrongswan-medsrv.la
 libstrongswan_medsrv_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_medsrv_la_SOURCES = medsrv_plugin.h medsrv_plugin.c \
-			      medsrv_creds.h medsrv_creds.c \
-			      medsrv_config.h medsrv_config.c
+libstrongswan_medsrv_la_SOURCES = \
+	medsrv_plugin.h medsrv_plugin.c \
+	medsrv_creds.h medsrv_creds.c \
+	medsrv_config.h medsrv_config.c
+
 libstrongswan_medsrv_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/nm/Makefile.am b/src/charon/plugins/nm/Makefile.am
index 95a1e5bc8..cabbe89cc 100644
--- a/src/charon/plugins/nm/Makefile.am
+++ b/src/charon/plugins/nm/Makefile.am
@@ -13,9 +13,10 @@ libstrongswan_nm_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
 libstrongswan_nm_la_SOURCES = \
-  nm_plugin.h nm_plugin.c \
-  nm_service.h nm_service.c \
-  nm_creds.h nm_creds.c \
-  nm_handler.h nm_handler.c
+	nm_plugin.h nm_plugin.c \
+	nm_service.h nm_service.c \
+	nm_creds.h nm_creds.c \
+	nm_handler.h nm_handler.c
+
 libstrongswan_nm_la_LDFLAGS = -module -avoid-version
 libstrongswan_nm_la_LIBADD += ${nm_LIBS}
diff --git a/src/charon/plugins/resolve/Makefile.am b/src/charon/plugins/resolve/Makefile.am
index 78eece670..f7f861fba 100644
--- a/src/charon/plugins/resolve/Makefile.am
+++ b/src/charon/plugins/resolve/Makefile.am
@@ -12,6 +12,7 @@ libstrongswan_resolve_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswa
 endif
 
 libstrongswan_resolve_la_SOURCES = \
-  resolve_plugin.h resolve_plugin.c \
-  resolve_handler.h resolve_handler.c
+	resolve_plugin.h resolve_plugin.c \
+	resolve_handler.h resolve_handler.c
+
 libstrongswan_resolve_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/smp/Makefile.am b/src/charon/plugins/smp/Makefile.am
index 9c67ea86e..aa56ab433 100644
--- a/src/charon/plugins/smp/Makefile.am
+++ b/src/charon/plugins/smp/Makefile.am
@@ -11,6 +11,8 @@ plugin_LTLIBRARIES = libstrongswan-smp.la
 libstrongswan_smp_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_smp_la_SOURCES = smp.h smp.c
+libstrongswan_smp_la_SOURCES = \
+	smp.h smp.c
+
 libstrongswan_smp_la_LDFLAGS = -module -avoid-version
 libstrongswan_smp_la_LIBADD += ${xml_LIBS}
diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am
index 9e7e345e2..c83b7b033 100644
--- a/src/charon/plugins/sql/Makefile.am
+++ b/src/charon/plugins/sql/Makefile.am
@@ -12,6 +12,7 @@ libstrongswan_sql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
 libstrongswan_sql_la_SOURCES = \
-  sql_plugin.h sql_plugin.c sql_config.h sql_config.c \
-  sql_cred.h sql_cred.c sql_logger.h sql_logger.c
+	sql_plugin.h sql_plugin.c sql_config.h sql_config.c \
+	sql_cred.h sql_cred.c sql_logger.h sql_logger.c
+
 libstrongswan_sql_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/stroke/Makefile.am b/src/charon/plugins/stroke/Makefile.am
index 21c3c80c7..81c9e7fce 100644
--- a/src/charon/plugins/stroke/Makefile.am
+++ b/src/charon/plugins/stroke/Makefile.am
@@ -13,14 +13,15 @@ plugin_LTLIBRARIES = libstrongswan-stroke.la
 libstrongswan_stroke_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_stroke_la_SOURCES = stroke_plugin.h stroke_plugin.c \
-  stroke_socket.h stroke_socket.c \
-  stroke_config.h stroke_config.c \
-  stroke_control.h stroke_control.c \
-  stroke_cred.h stroke_cred.c \
-  stroke_ca.h stroke_ca.c \
-  stroke_attribute.h stroke_attribute.c \
-  stroke_list.h stroke_list.c \
-  stroke_shared_key.h stroke_shared_key.c
+libstrongswan_stroke_la_SOURCES = \
+	stroke_plugin.h stroke_plugin.c \
+	stroke_socket.h stroke_socket.c \
+	stroke_config.h stroke_config.c \
+	stroke_control.h stroke_control.c \
+	stroke_cred.h stroke_cred.c \
+	stroke_ca.h stroke_ca.c \
+	stroke_attribute.h stroke_attribute.c \
+	stroke_list.h stroke_list.c \
+	stroke_shared_key.h stroke_shared_key.c
 
 libstrongswan_stroke_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/uci/Makefile.am b/src/charon/plugins/uci/Makefile.am
index f71921d71..7ca54c18e 100644
--- a/src/charon/plugins/uci/Makefile.am
+++ b/src/charon/plugins/uci/Makefile.am
@@ -12,10 +12,9 @@ libstrongswan_uci_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
 libstrongswan_uci_la_SOURCES = \
-  uci_plugin.h uci_plugin.c uci_parser.h uci_parser.c \
-  uci_config.h uci_config.c uci_creds.h uci_creds.c \
-  uci_control.h uci_control.c
+	uci_plugin.h uci_plugin.c uci_parser.h uci_parser.c \
+	uci_config.h uci_config.c uci_creds.h uci_creds.c \
+	uci_control.h uci_control.c
+
 libstrongswan_uci_la_LDFLAGS = -module -avoid-version
 libstrongswan_uci_la_LIBADD += -luci
-
-
diff --git a/src/charon/plugins/unit_tester/Makefile.am b/src/charon/plugins/unit_tester/Makefile.am
index 185ce87a5..758740cd7 100644
--- a/src/charon/plugins/unit_tester/Makefile.am
+++ b/src/charon/plugins/unit_tester/Makefile.am
@@ -10,19 +10,20 @@ plugin_LTLIBRARIES = libstrongswan-unit-tester.la
 libstrongswan_unit_tester_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_unit_tester_la_SOURCES = unit_tester.c unit_tester.h tests.h \
-  tests/test_enumerator.c \
-  tests/test_auth_info.c \
-  tests/test_curl.c \
-  tests/test_mysql.c \
-  tests/test_sqlite.c \
-  tests/test_mutex.c \
-  tests/test_rsa_gen.c \
-  tests/test_cert.c \
-  tests/test_med_db.c \
-  tests/test_chunk.c \
-  tests/test_pool.c \
-  tests/test_agent.c \
-  tests/test_id.c
+libstrongswan_unit_tester_la_SOURCES = \
+	unit_tester.c unit_tester.h tests.h \
+	tests/test_enumerator.c \
+	tests/test_auth_info.c \
+	tests/test_curl.c \
+	tests/test_mysql.c \
+	tests/test_sqlite.c \
+	tests/test_mutex.c \
+	tests/test_rsa_gen.c \
+	tests/test_cert.c \
+	tests/test_med_db.c \
+	tests/test_chunk.c \
+	tests/test_pool.c \
+	tests/test_agent.c \
+	tests/test_id.c
 
 libstrongswan_unit_tester_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/updown/Makefile.am b/src/charon/plugins/updown/Makefile.am
index e59a60db9..a54e537a2 100644
--- a/src/charon/plugins/updown/Makefile.am
+++ b/src/charon/plugins/updown/Makefile.am
@@ -11,6 +11,7 @@ libstrongswan_updown_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan
 endif
 
 libstrongswan_updown_la_SOURCES = \
-  updown_plugin.h updown_plugin.c \
-  updown_listener.h updown_listener.c
+	updown_plugin.h updown_plugin.c \
+	updown_listener.h updown_listener.c
+
 libstrongswan_updown_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/aes/Makefile.am b/src/libstrongswan/plugins/aes/Makefile.am
index 084f640d9..5f7629bb1 100644
--- a/src/libstrongswan/plugins/aes/Makefile.am
+++ b/src/libstrongswan/plugins/aes/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-aes.la
 libstrongswan_aes_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_aes_la_SOURCES = aes_plugin.h aes_plugin.c aes_crypter.c aes_crypter.h
+libstrongswan_aes_la_SOURCES = \
+	aes_plugin.h aes_plugin.c aes_crypter.c aes_crypter.h
+
 libstrongswan_aes_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/agent/Makefile.am b/src/libstrongswan/plugins/agent/Makefile.am
index 1163ffe32..6273dce70 100644
--- a/src/libstrongswan/plugins/agent/Makefile.am
+++ b/src/libstrongswan/plugins/agent/Makefile.am
@@ -10,7 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-agent.la
 libstrongswan_agent_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_agent_la_SOURCES = agent_plugin.h agent_plugin.c \
-  agent_private_key.c agent_private_key.h
+libstrongswan_agent_la_SOURCES = \
+	agent_plugin.h agent_plugin.c \
+	agent_private_key.c agent_private_key.h
 
 libstrongswan_agent_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/attr_sql/Makefile.am b/src/libstrongswan/plugins/attr_sql/Makefile.am
index d46ade426..eb3eae447 100644
--- a/src/libstrongswan/plugins/attr_sql/Makefile.am
+++ b/src/libstrongswan/plugins/attr_sql/Makefile.am
@@ -1,8 +1,9 @@
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 
-AM_CFLAGS = -rdynamic \
-  -DPLUGINS=\""${libstrongswan_plugins}\""
+AM_CFLAGS = \
+	-rdynamic \
+	-DPLUGINS=\""${libstrongswan_plugins}\""
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-attr-sql.la
@@ -12,8 +13,9 @@ libstrongswan_attr_sql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongsw
 endif
 
 libstrongswan_attr_sql_la_SOURCES = \
-  attr_sql_plugin.h attr_sql_plugin.c \
-  sql_attribute.h sql_attribute.c
+	attr_sql_plugin.h attr_sql_plugin.c \
+	sql_attribute.h sql_attribute.c
+
 libstrongswan_attr_sql_la_LDFLAGS = -module -avoid-version
 
 ipsec_PROGRAMS = pool
diff --git a/src/libstrongswan/plugins/blowfish/Makefile.am b/src/libstrongswan/plugins/blowfish/Makefile.am
index 1979179ea..3d560a750 100644
--- a/src/libstrongswan/plugins/blowfish/Makefile.am
+++ b/src/libstrongswan/plugins/blowfish/Makefile.am
@@ -11,6 +11,7 @@ libstrongswan_blowfish_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongsw
 endif
 
 libstrongswan_blowfish_la_SOURCES = \
-blowfish_plugin.h blowfish_plugin.c blowfish_crypter.c blowfish_crypter.h \
-bf_skey.c blowfish.h bf_pi.h bf_locl.h bf_enc.c
+	blowfish_plugin.h blowfish_plugin.c blowfish_crypter.c blowfish_crypter.h \
+	bf_skey.c blowfish.h bf_pi.h bf_locl.h bf_enc.c
+
 libstrongswan_blowfish_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/curl/Makefile.am b/src/libstrongswan/plugins/curl/Makefile.am
index cc20f51d3..c9460451b 100644
--- a/src/libstrongswan/plugins/curl/Makefile.am
+++ b/src/libstrongswan/plugins/curl/Makefile.am
@@ -11,6 +11,8 @@ plugin_LTLIBRARIES = libstrongswan-curl.la
 libstrongswan_curl_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_curl_la_SOURCES = curl_plugin.h curl_plugin.c curl_fetcher.c curl_fetcher.h
+libstrongswan_curl_la_SOURCES = \
+	curl_plugin.h curl_plugin.c curl_fetcher.c curl_fetcher.h
+
 libstrongswan_curl_la_LDFLAGS = -module -avoid-version
 libstrongswan_curl_la_LIBADD += -lcurl
diff --git a/src/libstrongswan/plugins/des/Makefile.am b/src/libstrongswan/plugins/des/Makefile.am
index a8f7861d0..91be7597a 100644
--- a/src/libstrongswan/plugins/des/Makefile.am
+++ b/src/libstrongswan/plugins/des/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-des.la
 libstrongswan_des_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_des_la_SOURCES = des_plugin.h des_plugin.c des_crypter.c des_crypter.h
+libstrongswan_des_la_SOURCES = \
+	des_plugin.h des_plugin.c des_crypter.c des_crypter.h
+
 libstrongswan_des_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/dnskey/Makefile.am b/src/libstrongswan/plugins/dnskey/Makefile.am
index 9c8e61215..68803f679 100644
--- a/src/libstrongswan/plugins/dnskey/Makefile.am
+++ b/src/libstrongswan/plugins/dnskey/Makefile.am
@@ -10,7 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-dnskey.la
 libstrongswan_dnskey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_dnskey_la_SOURCES = dnskey_plugin.h dnskey_plugin.c \
-  dnskey_builder.h dnskey_builder.c
+libstrongswan_dnskey_la_SOURCES = \
+	dnskey_plugin.h dnskey_plugin.c \
+	dnskey_builder.h dnskey_builder.c
 
 libstrongswan_dnskey_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/fips_prf/Makefile.am b/src/libstrongswan/plugins/fips_prf/Makefile.am
index 19b4feb26..42872cc2b 100644
--- a/src/libstrongswan/plugins/fips_prf/Makefile.am
+++ b/src/libstrongswan/plugins/fips_prf/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-fips-prf.la
 libstrongswan_fips_prf_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_fips_prf_la_SOURCES = fips_prf_plugin.h fips_prf_plugin.c fips_prf.c fips_prf.h
+libstrongswan_fips_prf_la_SOURCES = \
+	fips_prf_plugin.h fips_prf_plugin.c fips_prf.c fips_prf.h
+
 libstrongswan_fips_prf_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/gcrypt/Makefile.am b/src/libstrongswan/plugins/gcrypt/Makefile.am
index 941f86bcf..beabc4f14 100644
--- a/src/libstrongswan/plugins/gcrypt/Makefile.am
+++ b/src/libstrongswan/plugins/gcrypt/Makefile.am
@@ -11,7 +11,8 @@ plugin_LTLIBRARIES = libstrongswan-gcrypt.la
 libstrongswan_gcrypt_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_gcrypt_la_SOURCES = gcrypt_plugin.h gcrypt_plugin.c \
+libstrongswan_gcrypt_la_SOURCES = \
+	gcrypt_plugin.h gcrypt_plugin.c \
 	gcrypt_rsa_public_key.h gcrypt_rsa_public_key.c \
 	gcrypt_rsa_private_key.h gcrypt_rsa_private_key.c \
 	gcrypt_dh.h gcrypt_dh.c \
diff --git a/src/libstrongswan/plugins/gmp/Makefile.am b/src/libstrongswan/plugins/gmp/Makefile.am
index 3fadf360d..05ad0e766 100644
--- a/src/libstrongswan/plugins/gmp/Makefile.am
+++ b/src/libstrongswan/plugins/gmp/Makefile.am
@@ -11,10 +11,11 @@ plugin_LTLIBRARIES = libstrongswan-gmp.la
 libstrongswan_gmp_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_gmp_la_SOURCES = 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
+libstrongswan_gmp_la_SOURCES = \
+	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
 
 libstrongswan_gmp_la_LDFLAGS = -module -avoid-version
 libstrongswan_gmp_la_LIBADD += -lgmp
diff --git a/src/libstrongswan/plugins/hmac/Makefile.am b/src/libstrongswan/plugins/hmac/Makefile.am
index 7f3fa37bb..ee40ddb8d 100644
--- a/src/libstrongswan/plugins/hmac/Makefile.am
+++ b/src/libstrongswan/plugins/hmac/Makefile.am
@@ -10,6 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-hmac.la
 libstrongswan_hmac_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_hmac_la_SOURCES = hmac_plugin.h hmac_plugin.c hmac.h hmac.c \
+libstrongswan_hmac_la_SOURCES = \
+	hmac_plugin.h hmac_plugin.c hmac.h hmac.c \
 	hmac_prf.h hmac_prf.c hmac_signer.h hmac_signer.c
+
 libstrongswan_hmac_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/ldap/Makefile.am b/src/libstrongswan/plugins/ldap/Makefile.am
index e2e29bf97..42525bca2 100644
--- a/src/libstrongswan/plugins/ldap/Makefile.am
+++ b/src/libstrongswan/plugins/ldap/Makefile.am
@@ -11,7 +11,8 @@ plugin_LTLIBRARIES = libstrongswan-ldap.la
 libstrongswan_ldap_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_ldap_la_SOURCES = ldap_plugin.h ldap_plugin.c ldap_fetcher.h ldap_fetcher.c
+libstrongswan_ldap_la_SOURCES = \
+	ldap_plugin.h ldap_plugin.c ldap_fetcher.h ldap_fetcher.c
+
 libstrongswan_ldap_la_LDFLAGS = -module -avoid-version
 libstrongswan_ldap_la_LIBADD += -lldap -llber
-
diff --git a/src/libstrongswan/plugins/md4/Makefile.am b/src/libstrongswan/plugins/md4/Makefile.am
index 9484c3a11..d505419d4 100644
--- a/src/libstrongswan/plugins/md4/Makefile.am
+++ b/src/libstrongswan/plugins/md4/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-md4.la
 libstrongswan_md4_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_md4_la_SOURCES = md4_plugin.h md4_plugin.c md4_hasher.c md4_hasher.h
+libstrongswan_md4_la_SOURCES = \
+	md4_plugin.h md4_plugin.c md4_hasher.c md4_hasher.h
+
 libstrongswan_md4_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/md5/Makefile.am b/src/libstrongswan/plugins/md5/Makefile.am
index bef94a52f..8c8a1a245 100644
--- a/src/libstrongswan/plugins/md5/Makefile.am
+++ b/src/libstrongswan/plugins/md5/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-md5.la
 libstrongswan_md5_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_md5_la_SOURCES = md5_plugin.h md5_plugin.c md5_hasher.c md5_hasher.h
+libstrongswan_md5_la_SOURCES = \
+	md5_plugin.h md5_plugin.c md5_hasher.c md5_hasher.h
+
 libstrongswan_md5_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/mysql/Makefile.am b/src/libstrongswan/plugins/mysql/Makefile.am
index 9841cd032..dc5cee1d2 100644
--- a/src/libstrongswan/plugins/mysql/Makefile.am
+++ b/src/libstrongswan/plugins/mysql/Makefile.am
@@ -11,8 +11,10 @@ plugin_LTLIBRARIES = libstrongswan-mysql.la
 libstrongswan_mysql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_mysql_la_SOURCES = mysql_plugin.h mysql_plugin.c  \
+libstrongswan_mysql_la_SOURCES = \
+	mysql_plugin.h mysql_plugin.c  \
 	mysql_database.h mysql_database.c
+
 libstrongswan_mysql_la_LDFLAGS = -module -avoid-version
 libstrongswan_mysql_la_LIBADD += $(MYSQLLIB)
 
diff --git a/src/libstrongswan/plugins/openssl/Makefile.am b/src/libstrongswan/plugins/openssl/Makefile.am
index 51f7b349a..a5404b207 100644
--- a/src/libstrongswan/plugins/openssl/Makefile.am
+++ b/src/libstrongswan/plugins/openssl/Makefile.am
@@ -11,7 +11,8 @@ plugin_LTLIBRARIES = libstrongswan-openssl.la
 libstrongswan_openssl_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_openssl_la_SOURCES = openssl_plugin.h openssl_plugin.c \
+libstrongswan_openssl_la_SOURCES = \
+	openssl_plugin.h openssl_plugin.c \
 	openssl_util.c openssl_util.h \
 	openssl_crypter.c openssl_crypter.h \
 	openssl_hasher.c openssl_hasher.h \
diff --git a/src/libstrongswan/plugins/padlock/Makefile.am b/src/libstrongswan/plugins/padlock/Makefile.am
index b9bf4214c..8ebb57bb9 100644
--- a/src/libstrongswan/plugins/padlock/Makefile.am
+++ b/src/libstrongswan/plugins/padlock/Makefile.am
@@ -10,8 +10,10 @@ plugin_LTLIBRARIES = libstrongswan-padlock.la
 libstrongswan_padlock_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_padlock_la_SOURCES = padlock_plugin.h padlock_plugin.c \
+libstrongswan_padlock_la_SOURCES = \
+	padlock_plugin.h padlock_plugin.c \
 	padlock_aes_crypter.c padlock_aes_crypter.h \
 	padlock_sha1_hasher.c padlock_sha1_hasher.h \
 	padlock_rng.c padlock_rng.h
+
 libstrongswan_padlock_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/pem/Makefile.am b/src/libstrongswan/plugins/pem/Makefile.am
index ced2309a2..7acd30b38 100644
--- a/src/libstrongswan/plugins/pem/Makefile.am
+++ b/src/libstrongswan/plugins/pem/Makefile.am
@@ -10,7 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-pem.la
 libstrongswan_pem_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_pem_la_SOURCES = pem_plugin.h pem_plugin.c \
-  pem_builder.c pem_builder.h
+libstrongswan_pem_la_SOURCES = \
+	pem_plugin.h pem_plugin.c \
+	pem_builder.c pem_builder.h
 
 libstrongswan_pem_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/pgp/Makefile.am b/src/libstrongswan/plugins/pgp/Makefile.am
index 6bbad151d..6bf4249bb 100644
--- a/src/libstrongswan/plugins/pgp/Makefile.am
+++ b/src/libstrongswan/plugins/pgp/Makefile.am
@@ -10,10 +10,11 @@ plugin_LTLIBRARIES = libstrongswan-pgp.la
 libstrongswan_pgp_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_pgp_la_SOURCES = pgp_plugin.h pgp_plugin.c \
-  pgp_utils.h pgp_utils.c \
-  pgp_cert.h pgp_cert.c \
-  pgp_encoder.h pgp_encoder.c \
-  pgp_builder.h pgp_builder.c
+libstrongswan_pgp_la_SOURCES = \
+	pgp_plugin.h pgp_plugin.c \
+	pgp_utils.h pgp_utils.c \
+	pgp_cert.h pgp_cert.c \
+	pgp_encoder.h pgp_encoder.c \
+	pgp_builder.h pgp_builder.c
 
 libstrongswan_pgp_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/pkcs1/Makefile.am b/src/libstrongswan/plugins/pkcs1/Makefile.am
index 5d71095a6..abb271dfe 100644
--- a/src/libstrongswan/plugins/pkcs1/Makefile.am
+++ b/src/libstrongswan/plugins/pkcs1/Makefile.am
@@ -10,8 +10,9 @@ plugin_LTLIBRARIES = libstrongswan-pkcs1.la
 libstrongswan_pkcs1_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_pkcs1_la_SOURCES = pkcs1_plugin.h pkcs1_plugin.c \
-  pkcs1_encoder.h pkcs1_encoder.c \
-  pkcs1_builder.h pkcs1_builder.c
+libstrongswan_pkcs1_la_SOURCES = \
+	pkcs1_plugin.h pkcs1_plugin.c \
+	pkcs1_encoder.h pkcs1_encoder.c \
+	pkcs1_builder.h pkcs1_builder.c
 
 libstrongswan_pkcs1_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/pubkey/Makefile.am b/src/libstrongswan/plugins/pubkey/Makefile.am
index e87f7307b..84baaf010 100644
--- a/src/libstrongswan/plugins/pubkey/Makefile.am
+++ b/src/libstrongswan/plugins/pubkey/Makefile.am
@@ -10,7 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-pubkey.la
 libstrongswan_pubkey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_pubkey_la_SOURCES = pubkey_plugin.h pubkey_plugin.c \
-  pubkey_cert.h pubkey_cert.c
+libstrongswan_pubkey_la_SOURCES = \
+	pubkey_plugin.h pubkey_plugin.c \
+	pubkey_cert.h pubkey_cert.c
 
 libstrongswan_pubkey_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/random/Makefile.am b/src/libstrongswan/plugins/random/Makefile.am
index 1e86ddf52..1e9df763b 100644
--- a/src/libstrongswan/plugins/random/Makefile.am
+++ b/src/libstrongswan/plugins/random/Makefile.am
@@ -12,6 +12,8 @@ plugin_LTLIBRARIES = libstrongswan-random.la
 libstrongswan_random_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_random_la_SOURCES = random_plugin.h random_plugin.c \
-  random_rng.c random_rng.h
+libstrongswan_random_la_SOURCES = \
+	random_plugin.h random_plugin.c \
+	random_rng.c random_rng.h
+
 libstrongswan_random_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/sha1/Makefile.am b/src/libstrongswan/plugins/sha1/Makefile.am
index 564eecafd..a63981633 100644
--- a/src/libstrongswan/plugins/sha1/Makefile.am
+++ b/src/libstrongswan/plugins/sha1/Makefile.am
@@ -10,6 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-sha1.la
 libstrongswan_sha1_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_sha1_la_SOURCES = sha1_plugin.h sha1_plugin.c \
+libstrongswan_sha1_la_SOURCES = \
+	sha1_plugin.h sha1_plugin.c \
 	sha1_hasher.c sha1_hasher.h sha1_prf.c sha1_prf.h
+
 libstrongswan_sha1_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/sha2/Makefile.am b/src/libstrongswan/plugins/sha2/Makefile.am
index 4d93ff460..9fc4b77cf 100644
--- a/src/libstrongswan/plugins/sha2/Makefile.am
+++ b/src/libstrongswan/plugins/sha2/Makefile.am
@@ -10,5 +10,7 @@ plugin_LTLIBRARIES = libstrongswan-sha2.la
 libstrongswan_sha2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_sha2_la_SOURCES = sha2_plugin.h sha2_plugin.c sha2_hasher.c sha2_hasher.h
+libstrongswan_sha2_la_SOURCES = \
+	sha2_plugin.h sha2_plugin.c sha2_hasher.c sha2_hasher.h
+
 libstrongswan_sha2_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/sqlite/Makefile.am b/src/libstrongswan/plugins/sqlite/Makefile.am
index 42d592c16..7ac15963a 100644
--- a/src/libstrongswan/plugins/sqlite/Makefile.am
+++ b/src/libstrongswan/plugins/sqlite/Makefile.am
@@ -11,8 +11,10 @@ plugin_LTLIBRARIES = libstrongswan-sqlite.la
 libstrongswan_sqlite_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_sqlite_la_SOURCES = sqlite_plugin.h sqlite_plugin.c  \
+libstrongswan_sqlite_la_SOURCES = \
+	sqlite_plugin.h sqlite_plugin.c \
 	sqlite_database.h sqlite_database.c
+
 libstrongswan_sqlite_la_LDFLAGS = -module -avoid-version
 libstrongswan_sqlite_la_LIBADD += -lsqlite3
 
diff --git a/src/libstrongswan/plugins/test_vectors/Makefile.am b/src/libstrongswan/plugins/test_vectors/Makefile.am
index 2a683a284..d1bdb72ae 100644
--- a/src/libstrongswan/plugins/test_vectors/Makefile.am
+++ b/src/libstrongswan/plugins/test_vectors/Makefile.am
@@ -34,4 +34,5 @@ libstrongswan_test_vectors_la_SOURCES = \
 	test_vectors/sha2_hmac.c \
 	test_vectors/fips_prf.c \
 	test_vectors/rng.c
+
 libstrongswan_test_vectors_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/x509/Makefile.am b/src/libstrongswan/plugins/x509/Makefile.am
index 7dd51e33f..7e3ad1dd6 100644
--- a/src/libstrongswan/plugins/x509/Makefile.am
+++ b/src/libstrongswan/plugins/x509/Makefile.am
@@ -10,11 +10,13 @@ plugin_LTLIBRARIES = libstrongswan-x509.la
 libstrongswan_x509_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_x509_la_SOURCES = 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
+libstrongswan_x509_la_SOURCES = \
+	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
+
 libstrongswan_x509_la_LDFLAGS = -module -avoid-version
diff --git a/src/libstrongswan/plugins/xcbc/Makefile.am b/src/libstrongswan/plugins/xcbc/Makefile.am
index f8ae082fd..6cf001a1b 100644
--- a/src/libstrongswan/plugins/xcbc/Makefile.am
+++ b/src/libstrongswan/plugins/xcbc/Makefile.am
@@ -10,6 +10,8 @@ plugin_LTLIBRARIES = libstrongswan-xcbc.la
 libstrongswan_xcbc_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 endif
 
-libstrongswan_xcbc_la_SOURCES = xcbc_plugin.h xcbc_plugin.c xcbc.h xcbc.c \
+libstrongswan_xcbc_la_SOURCES = \
+	xcbc_plugin.h xcbc_plugin.c xcbc.h xcbc.c \
 	xcbc_prf.h xcbc_prf.c xcbc_signer.h xcbc_signer.c
+
 libstrongswan_xcbc_la_LDFLAGS = -module -avoid-version