From: Tobias Brunner Date: Tue, 2 Mar 2010 11:03:44 +0000 (+0100) Subject: Reverting eba28948a584b9d02474cf5d256b04b8d2adbe6a which was only necessary when... X-Git-Tag: 4.4.0~262 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afb364fff9feaf9b58610102550ba8f668e6ebc5;p=thirdparty%2Fstrongswan.git Reverting eba28948a584b9d02474cf5d256b04b8d2adbe6a which was only necessary when cross-compiling the plugins for Android 2.0. With the coming monolithic build using Android.mk files this won't be necessary anymore. --- diff --git a/src/charon/plugins/android/Makefile.am b/src/charon/plugins/android/Makefile.am index 1e428b07a1..a7024eaa90 100644 --- a/src/charon/plugins/android/Makefile.am +++ b/src/charon/plugins/android/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-android.la -libstrongswan_android_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-android.la -libstrongswan_android_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_android_la_SOURCES = \ @@ -16,4 +14,4 @@ libstrongswan_android_la_SOURCES = \ android_handler.c android_handler.h libstrongswan_android_la_LDFLAGS = -module -avoid-version -libstrongswan_android_la_LIBADD += -lcutils +libstrongswan_android_la_LIBADD = -lcutils diff --git a/src/charon/plugins/attr/Makefile.am b/src/charon/plugins/attr/Makefile.am index 98d9694ca9..6ba220abbf 100644 --- a/src/charon/plugins/attr/Makefile.am +++ b/src/charon/plugins/attr/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-attr.la else plugin_LTLIBRARIES = libstrongswan-attr.la -libstrongswan_attr_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_attr_la_SOURCES = \ diff --git a/src/charon/plugins/eap_aka/Makefile.am b/src/charon/plugins/eap_aka/Makefile.am index ddeacc5f08..c7ce8d96bb 100644 --- a/src/charon/plugins/eap_aka/Makefile.am +++ b/src/charon/plugins/eap_aka/Makefile.am @@ -8,7 +8,7 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-aka.la else plugin_LTLIBRARIES = libstrongswan-eap-aka.la -libstrongswan_eap_aka_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libsimaka/libsimaka.la +libstrongswan_eap_aka_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la endif libstrongswan_eap_aka_la_SOURCES = \ diff --git a/src/charon/plugins/eap_aka_3gpp2/Makefile.am b/src/charon/plugins/eap_aka_3gpp2/Makefile.am index 5a37669575..6bab07c177 100644 --- a/src/charon/plugins/eap_aka_3gpp2/Makefile.am +++ b/src/charon/plugins/eap_aka_3gpp2/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-aka-3gpp2.la -libstrongswan_eap_aka_3gpp2_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-eap-aka-3gpp2.la -libstrongswan_eap_aka_3gpp2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_aka_3gpp2_la_SOURCES = \ @@ -18,4 +16,4 @@ libstrongswan_eap_aka_3gpp2_la_SOURCES = \ 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 +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 8f0fea76d7..e87f5e8999 100644 --- a/src/charon/plugins/eap_gtc/Makefile.am +++ b/src/charon/plugins/eap_gtc/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-gtc.la else plugin_LTLIBRARIES = libstrongswan-eap-gtc.la -libstrongswan_eap_gtc_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_gtc_la_SOURCES = \ diff --git a/src/charon/plugins/eap_identity/Makefile.am b/src/charon/plugins/eap_identity/Makefile.am index 428ad396b3..f743f35664 100644 --- a/src/charon/plugins/eap_identity/Makefile.am +++ b/src/charon/plugins/eap_identity/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-identity.la else plugin_LTLIBRARIES = libstrongswan-eap-identity.la -libstrongswan_eap_identity_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_identity_la_SOURCES = \ diff --git a/src/charon/plugins/eap_md5/Makefile.am b/src/charon/plugins/eap_md5/Makefile.am index 838b1f4745..76b039b282 100644 --- a/src/charon/plugins/eap_md5/Makefile.am +++ b/src/charon/plugins/eap_md5/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-md5.la else plugin_LTLIBRARIES = libstrongswan-eap-md5.la -libstrongswan_eap_md5_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_md5_la_SOURCES = \ diff --git a/src/charon/plugins/eap_mschapv2/Makefile.am b/src/charon/plugins/eap_mschapv2/Makefile.am index 08c862cd85..3a2b6e2118 100644 --- a/src/charon/plugins/eap_mschapv2/Makefile.am +++ b/src/charon/plugins/eap_mschapv2/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-mschapv2.la else plugin_LTLIBRARIES = libstrongswan-eap-mschapv2.la -libstrongswan_eap_mschapv2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_mschapv2_la_SOURCES = \ diff --git a/src/charon/plugins/eap_radius/Makefile.am b/src/charon/plugins/eap_radius/Makefile.am index f9e37a7db8..9f1405469f 100644 --- a/src/charon/plugins/eap_radius/Makefile.am +++ b/src/charon/plugins/eap_radius/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-radius.la else plugin_LTLIBRARIES = libstrongswan-eap-radius.la -libstrongswan_eap_radius_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_radius_la_SOURCES = \ diff --git a/src/charon/plugins/eap_sim/Makefile.am b/src/charon/plugins/eap_sim/Makefile.am index 82e8ba7aa5..ddadebcfea 100644 --- a/src/charon/plugins/eap_sim/Makefile.am +++ b/src/charon/plugins/eap_sim/Makefile.am @@ -8,7 +8,7 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-sim.la else plugin_LTLIBRARIES = libstrongswan-eap-sim.la -libstrongswan_eap_sim_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libsimaka/libsimaka.la +libstrongswan_eap_sim_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la endif libstrongswan_eap_sim_la_SOURCES = \ diff --git a/src/charon/plugins/eap_sim_file/Makefile.am b/src/charon/plugins/eap_sim_file/Makefile.am index 80c3f23740..544883003a 100644 --- a/src/charon/plugins/eap_sim_file/Makefile.am +++ b/src/charon/plugins/eap_sim_file/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-sim-file.la else plugin_LTLIBRARIES = libstrongswan-eap-sim-file.la -libstrongswan_eap_sim_file_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_sim_file_la_SOURCES = \ diff --git a/src/charon/plugins/eap_simaka_pseudonym/Makefile.am b/src/charon/plugins/eap_simaka_pseudonym/Makefile.am index ce131471b4..1e88828267 100644 --- a/src/charon/plugins/eap_simaka_pseudonym/Makefile.am +++ b/src/charon/plugins/eap_simaka_pseudonym/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-simaka-pseudonym.la else plugin_LTLIBRARIES = libstrongswan-eap-simaka-pseudonym.la -libstrongswan_eap_simaka_pseudonym_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_simaka_pseudonym_la_SOURCES = \ diff --git a/src/charon/plugins/eap_simaka_reauth/Makefile.am b/src/charon/plugins/eap_simaka_reauth/Makefile.am index 958792555a..9196784321 100644 --- a/src/charon/plugins/eap_simaka_reauth/Makefile.am +++ b/src/charon/plugins/eap_simaka_reauth/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-eap-simaka-reauth.la else plugin_LTLIBRARIES = libstrongswan-eap-simaka-reauth.la -libstrongswan_eap_simaka_reauth_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_eap_simaka_reauth_la_SOURCES = \ diff --git a/src/charon/plugins/kernel_klips/Makefile.am b/src/charon/plugins/kernel_klips/Makefile.am index e8d31c51d2..74c3caa098 100644 --- a/src/charon/plugins/kernel_klips/Makefile.am +++ b/src/charon/plugins/kernel_klips/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-kernel-klips.la else plugin_LTLIBRARIES = libstrongswan-kernel-klips.la -libstrongswan_kernel_klips_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_kernel_klips_la_SOURCES = \ diff --git a/src/charon/plugins/kernel_netlink/Makefile.am b/src/charon/plugins/kernel_netlink/Makefile.am index c768cd5638..eda872882d 100644 --- a/src/charon/plugins/kernel_netlink/Makefile.am +++ b/src/charon/plugins/kernel_netlink/Makefile.am @@ -9,7 +9,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-kernel-netlink.la else plugin_LTLIBRARIES = libstrongswan-kernel-netlink.la -libstrongswan_kernel_netlink_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_kernel_netlink_la_SOURCES = \ diff --git a/src/charon/plugins/kernel_pfkey/Makefile.am b/src/charon/plugins/kernel_pfkey/Makefile.am index f621404ef4..2c7641e5f6 100644 --- a/src/charon/plugins/kernel_pfkey/Makefile.am +++ b/src/charon/plugins/kernel_pfkey/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-kernel-pfkey.la else plugin_LTLIBRARIES = libstrongswan-kernel-pfkey.la -libstrongswan_kernel_pfkey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_kernel_pfkey_la_SOURCES = \ diff --git a/src/charon/plugins/kernel_pfroute/Makefile.am b/src/charon/plugins/kernel_pfroute/Makefile.am index b5249a92b8..05499f070d 100644 --- a/src/charon/plugins/kernel_pfroute/Makefile.am +++ b/src/charon/plugins/kernel_pfroute/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-kernel-pfroute.la else plugin_LTLIBRARIES = libstrongswan-kernel-pfroute.la -libstrongswan_kernel_pfroute_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_kernel_pfroute_la_SOURCES = \ diff --git a/src/charon/plugins/load_tester/Makefile.am b/src/charon/plugins/load_tester/Makefile.am index cc2c6fc55c..090b0baf69 100644 --- a/src/charon/plugins/load_tester/Makefile.am +++ b/src/charon/plugins/load_tester/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-load-tester.la else plugin_LTLIBRARIES = libstrongswan-load-tester.la -libstrongswan_load_tester_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_load_tester_la_SOURCES = \ diff --git a/src/charon/plugins/medcli/Makefile.am b/src/charon/plugins/medcli/Makefile.am index acfa3190dd..e1e3dc53aa 100644 --- a/src/charon/plugins/medcli/Makefile.am +++ b/src/charon/plugins/medcli/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-medcli.la else plugin_LTLIBRARIES = libstrongswan-medcli.la -libstrongswan_medcli_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_medcli_la_SOURCES = \ diff --git a/src/charon/plugins/medsrv/Makefile.am b/src/charon/plugins/medsrv/Makefile.am index 9f547631e1..9775c098c7 100644 --- a/src/charon/plugins/medsrv/Makefile.am +++ b/src/charon/plugins/medsrv/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-medsrv.la else plugin_LTLIBRARIES = libstrongswan-medsrv.la -libstrongswan_medsrv_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_medsrv_la_SOURCES = \ diff --git a/src/charon/plugins/nm/Makefile.am b/src/charon/plugins/nm/Makefile.am index cabbe89ccb..a6d29dea61 100644 --- a/src/charon/plugins/nm/Makefile.am +++ b/src/charon/plugins/nm/Makefile.am @@ -6,10 +6,8 @@ AM_CFLAGS = -rdynamic \ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-nm.la -libstrongswan_nm_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-nm.la -libstrongswan_nm_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_nm_la_SOURCES = \ @@ -19,4 +17,4 @@ libstrongswan_nm_la_SOURCES = \ nm_handler.h nm_handler.c libstrongswan_nm_la_LDFLAGS = -module -avoid-version -libstrongswan_nm_la_LIBADD += ${nm_LIBS} +libstrongswan_nm_la_LIBADD = ${nm_LIBS} diff --git a/src/charon/plugins/resolve/Makefile.am b/src/charon/plugins/resolve/Makefile.am index f7f861fba3..04e61c342a 100644 --- a/src/charon/plugins/resolve/Makefile.am +++ b/src/charon/plugins/resolve/Makefile.am @@ -8,7 +8,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-resolve.la else plugin_LTLIBRARIES = libstrongswan-resolve.la -libstrongswan_resolve_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_resolve_la_SOURCES = \ diff --git a/src/charon/plugins/smp/Makefile.am b/src/charon/plugins/smp/Makefile.am index aa56ab4334..4e71419001 100644 --- a/src/charon/plugins/smp/Makefile.am +++ b/src/charon/plugins/smp/Makefile.am @@ -5,14 +5,12 @@ AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\" if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-smp.la -libstrongswan_smp_la_LIBADD = else 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_LDFLAGS = -module -avoid-version -libstrongswan_smp_la_LIBADD += ${xml_LIBS} +libstrongswan_smp_la_LIBADD = ${xml_LIBS} diff --git a/src/charon/plugins/socket_default/Makefile.am b/src/charon/plugins/socket_default/Makefile.am index 4eb5734da3..6b1ee2fee3 100644 --- a/src/charon/plugins/socket_default/Makefile.am +++ b/src/charon/plugins/socket_default/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-socket-default.la else plugin_LTLIBRARIES = libstrongswan-socket-default.la -libstrongswan_socket_default_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_socket_default_la_SOURCES = \ diff --git a/src/charon/plugins/socket_dynamic/Makefile.am b/src/charon/plugins/socket_dynamic/Makefile.am index b9ef24da65..546db5c16d 100644 --- a/src/charon/plugins/socket_dynamic/Makefile.am +++ b/src/charon/plugins/socket_dynamic/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-socket-dynamic.la else plugin_LTLIBRARIES = libstrongswan-socket-dynamic.la -libstrongswan_socket_dynamic_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_socket_dynamic_la_SOURCES = \ diff --git a/src/charon/plugins/socket_raw/Makefile.am b/src/charon/plugins/socket_raw/Makefile.am index f3682c8329..896cd0c11c 100644 --- a/src/charon/plugins/socket_raw/Makefile.am +++ b/src/charon/plugins/socket_raw/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-socket-raw.la else plugin_LTLIBRARIES = libstrongswan-socket-raw.la -libstrongswan_socket_raw_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_socket_raw_la_SOURCES = \ diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am index c83b7b0330..ece07f5383 100644 --- a/src/charon/plugins/sql/Makefile.am +++ b/src/charon/plugins/sql/Makefile.am @@ -8,7 +8,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-sql.la else plugin_LTLIBRARIES = libstrongswan-sql.la -libstrongswan_sql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_sql_la_SOURCES = \ diff --git a/src/charon/plugins/stroke/Makefile.am b/src/charon/plugins/stroke/Makefile.am index 81c9e7fcef..36e0d82804 100644 --- a/src/charon/plugins/stroke/Makefile.am +++ b/src/charon/plugins/stroke/Makefile.am @@ -10,7 +10,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-stroke.la else plugin_LTLIBRARIES = libstrongswan-stroke.la -libstrongswan_stroke_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_stroke_la_SOURCES = \ diff --git a/src/charon/plugins/uci/Makefile.am b/src/charon/plugins/uci/Makefile.am index 7ca54c18e1..ccaecc6bcc 100644 --- a/src/charon/plugins/uci/Makefile.am +++ b/src/charon/plugins/uci/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-uci.la -libstrongswan_uci_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-uci.la -libstrongswan_uci_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_uci_la_SOURCES = \ @@ -17,4 +15,4 @@ libstrongswan_uci_la_SOURCES = \ uci_control.h uci_control.c libstrongswan_uci_la_LDFLAGS = -module -avoid-version -libstrongswan_uci_la_LIBADD += -luci +libstrongswan_uci_la_LIBADD = -luci diff --git a/src/charon/plugins/unit_tester/Makefile.am b/src/charon/plugins/unit_tester/Makefile.am index 758740cd7f..c0307e06f2 100644 --- a/src/charon/plugins/unit_tester/Makefile.am +++ b/src/charon/plugins/unit_tester/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-unit-tester.la else plugin_LTLIBRARIES = libstrongswan-unit-tester.la -libstrongswan_unit_tester_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_unit_tester_la_SOURCES = \ diff --git a/src/charon/plugins/updown/Makefile.am b/src/charon/plugins/updown/Makefile.am index a54e537a20..1de2946bf7 100644 --- a/src/charon/plugins/updown/Makefile.am +++ b/src/charon/plugins/updown/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-updown.la else plugin_LTLIBRARIES = libstrongswan-updown.la -libstrongswan_updown_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_updown_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/aes/Makefile.am b/src/libstrongswan/plugins/aes/Makefile.am index 5f7629bb12..e72daeb44a 100644 --- a/src/libstrongswan/plugins/aes/Makefile.am +++ b/src/libstrongswan/plugins/aes/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-aes.la else plugin_LTLIBRARIES = libstrongswan-aes.la -libstrongswan_aes_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_aes_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/agent/Makefile.am b/src/libstrongswan/plugins/agent/Makefile.am index 6273dce70a..ffa6e8b7f9 100644 --- a/src/libstrongswan/plugins/agent/Makefile.am +++ b/src/libstrongswan/plugins/agent/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-agent.la else plugin_LTLIBRARIES = libstrongswan-agent.la -libstrongswan_agent_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_agent_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/attr_sql/Makefile.am b/src/libstrongswan/plugins/attr_sql/Makefile.am index eb3eae4474..9d73f2e9b6 100644 --- a/src/libstrongswan/plugins/attr_sql/Makefile.am +++ b/src/libstrongswan/plugins/attr_sql/Makefile.am @@ -9,7 +9,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-attr-sql.la else plugin_LTLIBRARIES = libstrongswan-attr-sql.la -libstrongswan_attr_sql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_attr_sql_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/blowfish/Makefile.am b/src/libstrongswan/plugins/blowfish/Makefile.am index 3d560a750a..95c414204f 100644 --- a/src/libstrongswan/plugins/blowfish/Makefile.am +++ b/src/libstrongswan/plugins/blowfish/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-blowfish.la else plugin_LTLIBRARIES = libstrongswan-blowfish.la -libstrongswan_blowfish_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_blowfish_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/curl/Makefile.am b/src/libstrongswan/plugins/curl/Makefile.am index c9460451b1..43718f6788 100644 --- a/src/libstrongswan/plugins/curl/Makefile.am +++ b/src/libstrongswan/plugins/curl/Makefile.am @@ -5,14 +5,12 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-curl.la -libstrongswan_curl_la_LIBADD = else 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_LDFLAGS = -module -avoid-version -libstrongswan_curl_la_LIBADD += -lcurl +libstrongswan_curl_la_LIBADD = -lcurl diff --git a/src/libstrongswan/plugins/des/Makefile.am b/src/libstrongswan/plugins/des/Makefile.am index 91be7597ac..c7d9ce915e 100644 --- a/src/libstrongswan/plugins/des/Makefile.am +++ b/src/libstrongswan/plugins/des/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-des.la else plugin_LTLIBRARIES = libstrongswan-des.la -libstrongswan_des_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_des_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/dnskey/Makefile.am b/src/libstrongswan/plugins/dnskey/Makefile.am index 68803f6790..fbba95e0ae 100644 --- a/src/libstrongswan/plugins/dnskey/Makefile.am +++ b/src/libstrongswan/plugins/dnskey/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-dnskey.la else plugin_LTLIBRARIES = libstrongswan-dnskey.la -libstrongswan_dnskey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_dnskey_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/fips_prf/Makefile.am b/src/libstrongswan/plugins/fips_prf/Makefile.am index 42872cc2b7..c9cf2c9774 100644 --- a/src/libstrongswan/plugins/fips_prf/Makefile.am +++ b/src/libstrongswan/plugins/fips_prf/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-fips-prf.la else plugin_LTLIBRARIES = libstrongswan-fips-prf.la -libstrongswan_fips_prf_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_fips_prf_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/gcrypt/Makefile.am b/src/libstrongswan/plugins/gcrypt/Makefile.am index beabc4f148..48bf916abe 100644 --- a/src/libstrongswan/plugins/gcrypt/Makefile.am +++ b/src/libstrongswan/plugins/gcrypt/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-gcrypt.la -libstrongswan_gcrypt_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-gcrypt.la -libstrongswan_gcrypt_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_gcrypt_la_SOURCES = \ @@ -21,4 +19,4 @@ libstrongswan_gcrypt_la_SOURCES = \ gcrypt_hasher.h gcrypt_hasher.c libstrongswan_gcrypt_la_LDFLAGS = -module -avoid-version -libstrongswan_gcrypt_la_LIBADD += -lgcrypt +libstrongswan_gcrypt_la_LIBADD = -lgcrypt diff --git a/src/libstrongswan/plugins/gmp/Makefile.am b/src/libstrongswan/plugins/gmp/Makefile.am index 05ad0e7669..cc8ad34db1 100644 --- a/src/libstrongswan/plugins/gmp/Makefile.am +++ b/src/libstrongswan/plugins/gmp/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-gmp.la -libstrongswan_gmp_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-gmp.la -libstrongswan_gmp_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_gmp_la_SOURCES = \ @@ -18,4 +16,4 @@ libstrongswan_gmp_la_SOURCES = \ gmp_rsa_public_key.c gmp_rsa_public_key.h libstrongswan_gmp_la_LDFLAGS = -module -avoid-version -libstrongswan_gmp_la_LIBADD += -lgmp +libstrongswan_gmp_la_LIBADD = -lgmp diff --git a/src/libstrongswan/plugins/hmac/Makefile.am b/src/libstrongswan/plugins/hmac/Makefile.am index ee40ddb8d4..77aa0ffd1f 100644 --- a/src/libstrongswan/plugins/hmac/Makefile.am +++ b/src/libstrongswan/plugins/hmac/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-hmac.la else plugin_LTLIBRARIES = libstrongswan-hmac.la -libstrongswan_hmac_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_hmac_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/ldap/Makefile.am b/src/libstrongswan/plugins/ldap/Makefile.am index 42525bca2e..2b2f7d31dd 100644 --- a/src/libstrongswan/plugins/ldap/Makefile.am +++ b/src/libstrongswan/plugins/ldap/Makefile.am @@ -5,14 +5,12 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-ldap.la -libstrongswan_ldap_la_LIBADD = else 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_LDFLAGS = -module -avoid-version -libstrongswan_ldap_la_LIBADD += -lldap -llber +libstrongswan_ldap_la_LIBADD = -lldap -llber diff --git a/src/libstrongswan/plugins/md4/Makefile.am b/src/libstrongswan/plugins/md4/Makefile.am index d505419d46..904af70c08 100644 --- a/src/libstrongswan/plugins/md4/Makefile.am +++ b/src/libstrongswan/plugins/md4/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-md4.la else plugin_LTLIBRARIES = libstrongswan-md4.la -libstrongswan_md4_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_md4_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/md5/Makefile.am b/src/libstrongswan/plugins/md5/Makefile.am index 8c8a1a245b..b2eb2abd2c 100644 --- a/src/libstrongswan/plugins/md5/Makefile.am +++ b/src/libstrongswan/plugins/md5/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-md5.la else plugin_LTLIBRARIES = libstrongswan-md5.la -libstrongswan_md5_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_md5_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/mysql/Makefile.am b/src/libstrongswan/plugins/mysql/Makefile.am index dc5cee1d23..801a7a7be1 100644 --- a/src/libstrongswan/plugins/mysql/Makefile.am +++ b/src/libstrongswan/plugins/mysql/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic $(MYSQLCFLAG) if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-mysql.la -libstrongswan_mysql_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-mysql.la -libstrongswan_mysql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_mysql_la_SOURCES = \ @@ -16,5 +14,5 @@ libstrongswan_mysql_la_SOURCES = \ mysql_database.h mysql_database.c libstrongswan_mysql_la_LDFLAGS = -module -avoid-version -libstrongswan_mysql_la_LIBADD += $(MYSQLLIB) +libstrongswan_mysql_la_LIBADD = $(MYSQLLIB) diff --git a/src/libstrongswan/plugins/openssl/Makefile.am b/src/libstrongswan/plugins/openssl/Makefile.am index a5404b2074..eee1ca5c02 100644 --- a/src/libstrongswan/plugins/openssl/Makefile.am +++ b/src/libstrongswan/plugins/openssl/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-openssl.la -libstrongswan_openssl_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-openssl.la -libstrongswan_openssl_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_openssl_la_SOURCES = \ @@ -24,5 +22,5 @@ libstrongswan_openssl_la_SOURCES = \ openssl_ec_public_key.c openssl_ec_public_key.h libstrongswan_openssl_la_LDFLAGS = -module -avoid-version -libstrongswan_openssl_la_LIBADD += -lcrypto +libstrongswan_openssl_la_LIBADD = -lcrypto diff --git a/src/libstrongswan/plugins/padlock/Makefile.am b/src/libstrongswan/plugins/padlock/Makefile.am index 8ebb57bb95..6706d26cb8 100644 --- a/src/libstrongswan/plugins/padlock/Makefile.am +++ b/src/libstrongswan/plugins/padlock/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-padlock.la else plugin_LTLIBRARIES = libstrongswan-padlock.la -libstrongswan_padlock_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_padlock_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/pem/Makefile.am b/src/libstrongswan/plugins/pem/Makefile.am index 7acd30b38a..f43423a855 100644 --- a/src/libstrongswan/plugins/pem/Makefile.am +++ b/src/libstrongswan/plugins/pem/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-pem.la else plugin_LTLIBRARIES = libstrongswan-pem.la -libstrongswan_pem_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_pem_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/pgp/Makefile.am b/src/libstrongswan/plugins/pgp/Makefile.am index 6bf4249bbc..4b414616d6 100644 --- a/src/libstrongswan/plugins/pgp/Makefile.am +++ b/src/libstrongswan/plugins/pgp/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-pgp.la else plugin_LTLIBRARIES = libstrongswan-pgp.la -libstrongswan_pgp_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_pgp_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/pkcs1/Makefile.am b/src/libstrongswan/plugins/pkcs1/Makefile.am index abb271dfe8..bd3203dae9 100644 --- a/src/libstrongswan/plugins/pkcs1/Makefile.am +++ b/src/libstrongswan/plugins/pkcs1/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-pkcs1.la else plugin_LTLIBRARIES = libstrongswan-pkcs1.la -libstrongswan_pkcs1_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_pkcs1_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/pubkey/Makefile.am b/src/libstrongswan/plugins/pubkey/Makefile.am index 84baaf0106..c2974a585d 100644 --- a/src/libstrongswan/plugins/pubkey/Makefile.am +++ b/src/libstrongswan/plugins/pubkey/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-pubkey.la else plugin_LTLIBRARIES = libstrongswan-pubkey.la -libstrongswan_pubkey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_pubkey_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/random/Makefile.am b/src/libstrongswan/plugins/random/Makefile.am index 1e9df763bc..5df9927181 100644 --- a/src/libstrongswan/plugins/random/Makefile.am +++ b/src/libstrongswan/plugins/random/Makefile.am @@ -9,7 +9,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-random.la else plugin_LTLIBRARIES = libstrongswan-random.la -libstrongswan_random_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_random_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/sha1/Makefile.am b/src/libstrongswan/plugins/sha1/Makefile.am index a63981633e..4e539fd837 100644 --- a/src/libstrongswan/plugins/sha1/Makefile.am +++ b/src/libstrongswan/plugins/sha1/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-sha1.la else plugin_LTLIBRARIES = libstrongswan-sha1.la -libstrongswan_sha1_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_sha1_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/sha2/Makefile.am b/src/libstrongswan/plugins/sha2/Makefile.am index 9fc4b77cf5..a255d06094 100644 --- a/src/libstrongswan/plugins/sha2/Makefile.am +++ b/src/libstrongswan/plugins/sha2/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-sha2.la else plugin_LTLIBRARIES = libstrongswan-sha2.la -libstrongswan_sha2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_sha2_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/sqlite/Makefile.am b/src/libstrongswan/plugins/sqlite/Makefile.am index 7ac15963ae..2e1d9733f9 100644 --- a/src/libstrongswan/plugins/sqlite/Makefile.am +++ b/src/libstrongswan/plugins/sqlite/Makefile.am @@ -5,10 +5,8 @@ AM_CFLAGS = -rdynamic if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-sqlite.la -libstrongswan_sqlite_la_LIBADD = else plugin_LTLIBRARIES = libstrongswan-sqlite.la -libstrongswan_sqlite_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_sqlite_la_SOURCES = \ @@ -16,5 +14,5 @@ libstrongswan_sqlite_la_SOURCES = \ sqlite_database.h sqlite_database.c libstrongswan_sqlite_la_LDFLAGS = -module -avoid-version -libstrongswan_sqlite_la_LIBADD += -lsqlite3 +libstrongswan_sqlite_la_LIBADD = -lsqlite3 diff --git a/src/libstrongswan/plugins/test_vectors/Makefile.am b/src/libstrongswan/plugins/test_vectors/Makefile.am index d1bdb72ae9..6d3b05d191 100644 --- a/src/libstrongswan/plugins/test_vectors/Makefile.am +++ b/src/libstrongswan/plugins/test_vectors/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-test-vectors.la else plugin_LTLIBRARIES = libstrongswan-test-vectors.la -libstrongswan_test_vectors_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_test_vectors_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/x509/Makefile.am b/src/libstrongswan/plugins/x509/Makefile.am index 7e3ad1dd68..4b50d78dcb 100644 --- a/src/libstrongswan/plugins/x509/Makefile.am +++ b/src/libstrongswan/plugins/x509/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-x509.la else plugin_LTLIBRARIES = libstrongswan-x509.la -libstrongswan_x509_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_x509_la_SOURCES = \ diff --git a/src/libstrongswan/plugins/xcbc/Makefile.am b/src/libstrongswan/plugins/xcbc/Makefile.am index 6cf001a1b6..7de306832e 100644 --- a/src/libstrongswan/plugins/xcbc/Makefile.am +++ b/src/libstrongswan/plugins/xcbc/Makefile.am @@ -7,7 +7,6 @@ if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-xcbc.la else plugin_LTLIBRARIES = libstrongswan-xcbc.la -libstrongswan_xcbc_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la endif libstrongswan_xcbc_la_SOURCES = \