Link all plugins to libstrongswan.

diff --git a/src/charon/plugins/android/Makefile.am b/src/charon/plugins/android/Makefile.am
index 732d474871415e9dbe9ca37f4226eb904f5733b8..86fc231f8f8c9d86d33b43cef0caf0428cbf25c8 100644 (file)
--- a/src/charon/plugins/android/Makefile.am
+++ b/src/charon/plugins/android/Makefile.am
@@ -10,4 +10,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 = $(top_builddir)/src/libstrongswan/libstrongswan.la -lcutils

diff --git a/src/charon/plugins/attr/Makefile.am b/src/charon/plugins/attr/Makefile.am
index b4b3b7da6bd3d310d41b5da08d9cf52c44688810..08a3b3af80e8a4981e82dcb0769d87fbe6021b8a 100644 (file)
--- a/src/charon/plugins/attr/Makefile.am
+++ b/src/charon/plugins/attr/Makefile.am
@@ -7,3 +7,4 @@ plugin_LTLIBRARIES = libstrongswan-attr.la
 libstrongswan_attr_la_SOURCES = attr_plugin.h attr_plugin.c \
   attr_provider.h attr_provider.c
 libstrongswan_attr_la_LDFLAGS = -module -avoid-version
+libstrongswan_attr_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

diff --git a/src/charon/plugins/eap_aka/Makefile.am b/src/charon/plugins/eap_aka/Makefile.am
index e007f5f002393137b13b32fd1789c83743a27374..63966ad34b4a9a1649aa1fe5e52082567e6a7f31 100644 (file)
--- a/src/charon/plugins/eap_aka/Makefile.am
+++ b/src/charon/plugins/eap_aka/Makefile.am
@@ -9,6 +9,6 @@ plugin_LTLIBRARIES = libstrongswan-eap-aka.la
 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_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 libstrongswan_eap_aka_la_LDFLAGS = -module -avoid-version
+libstrongswan_eap_aka_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libsimaka/libsimaka.la
 

diff --git a/src/charon/plugins/eap_aka_3gpp2/Makefile.am b/src/charon/plugins/eap_aka_3gpp2/Makefile.am
index 1a4a3765bc38ac689368fae21a9fd3b6b0dc8d83..5996ab9e68850d0e16d08d1236aaced05e1899f4 100644 (file)
--- a/src/charon/plugins/eap_aka_3gpp2/Makefile.am
+++ b/src/charon/plugins/eap_aka_3gpp2/Makefile.am
@@ -11,5 +11,5 @@ libstrongswan_eap_aka_3gpp2_la_SOURCES = \
   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
+libstrongswan_eap_aka_3gpp2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp
 

diff --git a/src/charon/plugins/eap_gtc/Makefile.am b/src/charon/plugins/eap_gtc/Makefile.am
index 0d938cacdccb133302475bc64f62eba705faf22b..633f97e44e80e7817ee4aceccb01abb31298e8e0 100644 (file)
--- a/src/charon/plugins/eap_gtc/Makefile.am
+++ b/src/charon/plugins/eap_gtc/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-eap-gtc.la
 
 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
+libstrongswan_eap_gtc_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/eap_identity/Makefile.am b/src/charon/plugins/eap_identity/Makefile.am
index 992eb43f72c13443b6b07e3da06df2edfb547563..a0d87f65af6a00c05847f2e14e0a29c611964085 100644 (file)
--- a/src/charon/plugins/eap_identity/Makefile.am
+++ b/src/charon/plugins/eap_identity/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-eap-identity.la
 libstrongswan_eap_identity_la_SOURCES = \
   eap_identity_plugin.h eap_identity_plugin.c eap_identity.h eap_identity.c
 libstrongswan_eap_identity_la_LDFLAGS = -module -avoid-version
+libstrongswan_eap_identity_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/eap_md5/Makefile.am b/src/charon/plugins/eap_md5/Makefile.am
index f49928cd23c95367b06c27ec5fa0835fbc66cd03..5d61f1eda0fa49efd1815ba22b650422cfd5a7b3 100644 (file)
--- a/src/charon/plugins/eap_md5/Makefile.am
+++ b/src/charon/plugins/eap_md5/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-eap-md5.la
 
 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
+libstrongswan_eap_md5_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/eap_mschapv2/Makefile.am b/src/charon/plugins/eap_mschapv2/Makefile.am
index 4758ad5f3cf81beb453cb0b821a71b62984d8afa..bae2a0fa7e99204cc6ebf04001069e6cfeadd12d 100644 (file)
--- a/src/charon/plugins/eap_mschapv2/Makefile.am
+++ b/src/charon/plugins/eap_mschapv2/Makefile.am
@@ -9,4 +9,5 @@ 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
+libstrongswan_eap_mschapv2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/eap_radius/Makefile.am b/src/charon/plugins/eap_radius/Makefile.am
index e476fbed6f9415507497a57fb4e12acd31b7e86c..19d6ee0bb20052cd0f09098589ed0ae9869eb43b 100644 (file)
--- a/src/charon/plugins/eap_radius/Makefile.am
+++ b/src/charon/plugins/eap_radius/Makefile.am
@@ -11,4 +11,5 @@ libstrongswan_eap_radius_la_SOURCES = \
   radius_client.h radius_client.c \
   radius_message.h radius_message.c
 libstrongswan_eap_radius_la_LDFLAGS = -module -avoid-version
+libstrongswan_eap_radius_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/eap_sim/Makefile.am b/src/charon/plugins/eap_sim/Makefile.am
index 74b9bb4e8c967a54b957b40e6a84d5dc6972e750..8e6b5eee059d2daac16c49e9ed016dc4bd862554 100644 (file)
--- a/src/charon/plugins/eap_sim/Makefile.am
+++ b/src/charon/plugins/eap_sim/Makefile.am
@@ -9,6 +9,5 @@ plugin_LTLIBRARIES = libstrongswan-eap-sim.la
 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_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
-libstrongswan_eap_sim_la_LDFLAGS = -module -avoid-version
+libstrongswan_eap_sim_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libsimaka/libsimaka.la
 

diff --git a/src/charon/plugins/eap_sim_file/Makefile.am b/src/charon/plugins/eap_sim_file/Makefile.am
index 350d4244fe4c625476a464ac3912290e021ee7c4..30dc093d10544e08468bdf1f9be24119ee5e5b8a 100644 (file)
--- a/src/charon/plugins/eap_sim_file/Makefile.am
+++ b/src/charon/plugins/eap_sim_file/Makefile.am
@@ -11,4 +11,5 @@ libstrongswan_eap_sim_file_la_SOURCES = \
   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
+libstrongswan_eap_sim_file_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/eap_simaka_pseudonym/Makefile.am b/src/charon/plugins/eap_simaka_pseudonym/Makefile.am
index fe87d6d62925460054636437cd6f20d9bac8a570..76f88fde8e775aa8ac2baf4a67b59029a413c9c4 100644 (file)
--- a/src/charon/plugins/eap_simaka_pseudonym/Makefile.am
+++ b/src/charon/plugins/eap_simaka_pseudonym/Makefile.am
@@ -10,4 +10,5 @@ libstrongswan_eap_simaka_pseudonym_la_SOURCES = \
   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
+libstrongswan_eap_simaka_pseudonym_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/eap_simaka_reauth/Makefile.am b/src/charon/plugins/eap_simaka_reauth/Makefile.am
index 0ba72713606dfcd385587f74b91637d118417333..1183af9f38de869a77b9176bf1a15fca56ddf2b8 100644 (file)
--- a/src/charon/plugins/eap_simaka_reauth/Makefile.am
+++ b/src/charon/plugins/eap_simaka_reauth/Makefile.am
@@ -10,4 +10,5 @@ libstrongswan_eap_simaka_reauth_la_SOURCES = \
   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
+libstrongswan_eap_simaka_reauth_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/kernel_klips/Makefile.am b/src/charon/plugins/kernel_klips/Makefile.am
index a7ae06df10b6e7f75805430ac44352015b2190d0..cd8d033a753b90c650874aeaa17ad6ed412140ba 100644 (file)
--- a/src/charon/plugins/kernel_klips/Makefile.am
+++ b/src/charon/plugins/kernel_klips/Makefile.am
@@ -8,3 +8,4 @@ plugin_LTLIBRARIES = libstrongswan-kernel-klips.la
 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
+libstrongswan_kernel_klips_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

diff --git a/src/charon/plugins/kernel_netlink/Makefile.am b/src/charon/plugins/kernel_netlink/Makefile.am
index 31d9c6d5ce18e520be618853c548a967e5cd40ae..e97393b1f5aacd88ef309dcab3bc5792a005d88d 100644 (file)
--- a/src/charon/plugins/kernel_netlink/Makefile.am
+++ b/src/charon/plugins/kernel_netlink/Makefile.am
@@ -11,3 +11,4 @@ libstrongswan_kernel_netlink_la_SOURCES = kernel_netlink_plugin.h kernel_netlink
        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
+libstrongswan_kernel_netlink_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

diff --git a/src/charon/plugins/kernel_pfkey/Makefile.am b/src/charon/plugins/kernel_pfkey/Makefile.am
index a72c6a999dc88d7e7a9ff07aa04e2fc33845c6c4..967f97dbc14887f02071c8d7bb09941119c53209 100644 (file)
--- a/src/charon/plugins/kernel_pfkey/Makefile.am
+++ b/src/charon/plugins/kernel_pfkey/Makefile.am
@@ -8,3 +8,4 @@ plugin_LTLIBRARIES = libstrongswan-kernel-pfkey.la
 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
+libstrongswan_kernel_pfkey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

diff --git a/src/charon/plugins/kernel_pfroute/Makefile.am b/src/charon/plugins/kernel_pfroute/Makefile.am
index 0065d9b0a9140e6566fc5fa7c6b89bb46036c0eb..15f62311cf6ac66fe6dc2e7127e90b29686cb721 100644 (file)
--- a/src/charon/plugins/kernel_pfroute/Makefile.am
+++ b/src/charon/plugins/kernel_pfroute/Makefile.am
@@ -8,3 +8,4 @@ plugin_LTLIBRARIES = libstrongswan-kernel-pfroute.la
 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
+libstrongswan_kernel_pfroute_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

diff --git a/src/charon/plugins/load_tester/Makefile.am b/src/charon/plugins/load_tester/Makefile.am
index e6e04229a0078a8ef70be3a5e35f1cfd7456a240..db1317e8c1b8635668d18d72dff8161147f65ddc 100644 (file)
--- a/src/charon/plugins/load_tester/Makefile.am
+++ b/src/charon/plugins/load_tester/Makefile.am
@@ -14,4 +14,5 @@ libstrongswan_load_tester_la_SOURCES = \
   load_tester_diffie_hellman.c load_tester_diffie_hellman.h
 
 libstrongswan_load_tester_la_LDFLAGS = -module -avoid-version
+libstrongswan_load_tester_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/medcli/Makefile.am b/src/charon/plugins/medcli/Makefile.am
index a5f018f82f3e4a1cc44e93fdf696134a29b3d729..96bb650cf44bd6354e2cd2b04a7aef1e5f8e61ce 100644 (file)
--- a/src/charon/plugins/medcli/Makefile.am
+++ b/src/charon/plugins/medcli/Makefile.am
@@ -9,4 +9,5 @@ libstrongswan_medcli_la_SOURCES = medcli_plugin.h medcli_plugin.c \
                              medcli_config.h medcli_config.c \
                              medcli_listener.h medcli_listener.c
 libstrongswan_medcli_la_LDFLAGS = -module -avoid-version
+libstrongswan_medcli_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/medsrv/Makefile.am b/src/charon/plugins/medsrv/Makefile.am
index f3611a79ef2dc1ecf5e8edf838eb0f49bb1b102f..ddc71c62fee7be4dddf25065c38e1aee72113c98 100644 (file)
--- a/src/charon/plugins/medsrv/Makefile.am
+++ b/src/charon/plugins/medsrv/Makefile.am
@@ -8,4 +8,5 @@ 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
+libstrongswan_medsrv_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/nm/Makefile.am b/src/charon/plugins/nm/Makefile.am
index 56eae6e00d823f987cb532dadabd4535b1bd1821..5e9d3abaec8290c1609db864c4bb2bcc20a66501 100644 (file)
--- a/src/charon/plugins/nm/Makefile.am
+++ b/src/charon/plugins/nm/Makefile.am
@@ -11,4 +11,4 @@ libstrongswan_nm_la_SOURCES = \
   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}
+libstrongswan_nm_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la ${nm_LIBS}

diff --git a/src/charon/plugins/resolve/Makefile.am b/src/charon/plugins/resolve/Makefile.am
index 9d18b00b46b5930d55667326883f0cc2abe8b6ec..5d6f48c9fdd1ddde433729a86fa132fe57123330 100644 (file)
--- a/src/charon/plugins/resolve/Makefile.am
+++ b/src/charon/plugins/resolve/Makefile.am
@@ -9,5 +9,6 @@ libstrongswan_resolve_la_SOURCES = \
   resolve_plugin.h resolve_plugin.c \
   resolve_handler.h resolve_handler.c
 libstrongswan_resolve_la_LDFLAGS = -module -avoid-version
+libstrongswan_resolve_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 

diff --git a/src/charon/plugins/smp/Makefile.am b/src/charon/plugins/smp/Makefile.am
index a434b388b86e54636bd832a4a42743bcee174818..7a68b20370d63b8a5268ef2143b9f65b0e28a983 100644 (file)
--- a/src/charon/plugins/smp/Makefile.am
+++ b/src/charon/plugins/smp/Makefile.am
@@ -6,5 +6,5 @@ AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
 plugin_LTLIBRARIES = libstrongswan-smp.la
 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 = $(top_builddir)/src/libstrongswan/libstrongswan.la ${xml_LIBS}
 

diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am
index 60135bf08f8c791649b1919fa809892dc586e100..c8adfc276595c5fb7ba47ca58f22267e7043c1f7 100644 (file)
--- a/src/charon/plugins/sql/Makefile.am
+++ b/src/charon/plugins/sql/Makefile.am
@@ -9,4 +9,5 @@ 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
 libstrongswan_sql_la_LDFLAGS = -module -avoid-version
+libstrongswan_sql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/stroke/Makefile.am b/src/charon/plugins/stroke/Makefile.am
index 94d3116099e9712227eb1657ecfe699ddfc8a3bc..2713aabf78725fa5cdd753a0042302b2aa4024aa 100644 (file)
--- a/src/charon/plugins/stroke/Makefile.am
+++ b/src/charon/plugins/stroke/Makefile.am
@@ -19,4 +19,5 @@ libstrongswan_stroke_la_SOURCES = stroke_plugin.h stroke_plugin.c \
   stroke_shared_key.h stroke_shared_key.c
 
 libstrongswan_stroke_la_LDFLAGS = -module -avoid-version
+libstrongswan_stroke_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/uci/Makefile.am b/src/charon/plugins/uci/Makefile.am
index 9fdbfb7099bcc58ebc2cb65b49d33c75bec8f04c..7801255dce62cdb0ee6af4fa91b53935875acd7d 100644 (file)
--- a/src/charon/plugins/uci/Makefile.am
+++ b/src/charon/plugins/uci/Makefile.am
@@ -9,6 +9,6 @@ libstrongswan_uci_la_SOURCES = \
   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
+libstrongswan_uci_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -luci
 
 

diff --git a/src/charon/plugins/unit_tester/Makefile.am b/src/charon/plugins/unit_tester/Makefile.am
index 64846f9950261983fa577f4758e49d383cfe59fe..28f0589845e82d7367f9f6d39f745909b37d9b69 100644 (file)
--- a/src/charon/plugins/unit_tester/Makefile.am
+++ b/src/charon/plugins/unit_tester/Makefile.am
@@ -21,4 +21,5 @@ libstrongswan_unit_tester_la_SOURCES = unit_tester.c unit_tester.h tests.h \
   tests/test_id.c
 
 libstrongswan_unit_tester_la_LDFLAGS = -module -avoid-version
+libstrongswan_unit_tester_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/charon/plugins/updown/Makefile.am b/src/charon/plugins/updown/Makefile.am
index 6cad02a965a1134da26adb0bd002ff49765a3142..f698e2c618f67b840267f94e0f37a67fd9fc2ece 100644 (file)
--- a/src/charon/plugins/updown/Makefile.am
+++ b/src/charon/plugins/updown/Makefile.am
@@ -8,5 +8,6 @@ libstrongswan_updown_la_SOURCES = \
   updown_plugin.h updown_plugin.c \
   updown_listener.h updown_listener.c
 libstrongswan_updown_la_LDFLAGS = -module -avoid-version
+libstrongswan_updown_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 

diff --git a/src/libstrongswan/plugins/aes/Makefile.am b/src/libstrongswan/plugins/aes/Makefile.am
index a3101172fb42db2b3d9b2fa8444d7298097fb81d..9acd3999cfb41563f367c7c16456965e8e82d447 100644 (file)
--- a/src/libstrongswan/plugins/aes/Makefile.am
+++ b/src/libstrongswan/plugins/aes/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-aes.la
 
 libstrongswan_aes_la_SOURCES = aes_plugin.h aes_plugin.c aes_crypter.c aes_crypter.h
 libstrongswan_aes_la_LDFLAGS = -module -avoid-version
+libstrongswan_aes_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/agent/Makefile.am b/src/libstrongswan/plugins/agent/Makefile.am
index e1000e562c6e51fa18b3ace71434c49e7fabac37..72157bbf098033d508bce8c4c620a3fff5ccc615 100644 (file)
--- a/src/libstrongswan/plugins/agent/Makefile.am
+++ b/src/libstrongswan/plugins/agent/Makefile.am
@@ -9,4 +9,5 @@ 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
+libstrongswan_agent_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/attr_sql/Makefile.am b/src/libstrongswan/plugins/attr_sql/Makefile.am
index 5be310abfc5aaddd570038275d329ce463f9f6a8..5e98ea010c2da039c0ab7c2f77b1958985d06f78 100644 (file)
--- a/src/libstrongswan/plugins/attr_sql/Makefile.am
+++ b/src/libstrongswan/plugins/attr_sql/Makefile.am
@@ -9,6 +9,7 @@ libstrongswan_attr_sql_la_SOURCES = \
   attr_sql_plugin.h attr_sql_plugin.c \
   sql_attribute.h sql_attribute.c
 libstrongswan_attr_sql_la_LDFLAGS = -module -avoid-version
+libstrongswan_attr_sql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 ipsec_PROGRAMS = pool
 pool_SOURCES = pool.c

diff --git a/src/libstrongswan/plugins/blowfish/Makefile.am b/src/libstrongswan/plugins/blowfish/Makefile.am
index de89484454cd34ac63bc391a476425e716176826..5554eb0658b6b43b9eb55888da7a2eeefa89e57f 100644 (file)
--- a/src/libstrongswan/plugins/blowfish/Makefile.am
+++ b/src/libstrongswan/plugins/blowfish/Makefile.am
@@ -9,4 +9,5 @@ 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
 libstrongswan_blowfish_la_LDFLAGS = -module -avoid-version
+libstrongswan_blowfish_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/curl/Makefile.am b/src/libstrongswan/plugins/curl/Makefile.am
index f0a41e4add4ab7d68ac7394bde22d314ec8133dc..4b51c17715f8852ca66f244c1bcfca3d063bd12d 100644 (file)
--- a/src/libstrongswan/plugins/curl/Makefile.am
+++ b/src/libstrongswan/plugins/curl/Makefile.am
@@ -7,5 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-curl.la
 
 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 = $(top_builddir)/src/libstrongswan/libstrongswan.la -lcurl
 

diff --git a/src/libstrongswan/plugins/des/Makefile.am b/src/libstrongswan/plugins/des/Makefile.am
index 76cfbc419e9308c34aa8fe10c646b67dbeb2b061..e63e400e3401eff5b267a7ec48632badec23ce17 100644 (file)
--- a/src/libstrongswan/plugins/des/Makefile.am
+++ b/src/libstrongswan/plugins/des/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-des.la
 
 libstrongswan_des_la_SOURCES = des_plugin.h des_plugin.c des_crypter.c des_crypter.h
 libstrongswan_des_la_LDFLAGS = -module -avoid-version
+libstrongswan_des_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/dnskey/Makefile.am b/src/libstrongswan/plugins/dnskey/Makefile.am
index fd020f50590a60d613cc0c3a091d46ab823af777..dac40d60bf84e19a3badeb753c9429ada0b7be0e 100644 (file)
--- a/src/libstrongswan/plugins/dnskey/Makefile.am
+++ b/src/libstrongswan/plugins/dnskey/Makefile.am
@@ -9,4 +9,5 @@ libstrongswan_dnskey_la_SOURCES = dnskey_plugin.h dnskey_plugin.c \
   dnskey_builder.h dnskey_builder.c
 
 libstrongswan_dnskey_la_LDFLAGS = -module -avoid-version
+libstrongswan_dnskey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/fips_prf/Makefile.am b/src/libstrongswan/plugins/fips_prf/Makefile.am
index d9431947e4d1173232c7040b00f51b272c2d73b9..fbf8a46d3fcbe548a5cdbf6d176403ea9d0c9aa1 100644 (file)
--- a/src/libstrongswan/plugins/fips_prf/Makefile.am
+++ b/src/libstrongswan/plugins/fips_prf/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-fips-prf.la
 
 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
+libstrongswan_fips_prf_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/gcrypt/Makefile.am b/src/libstrongswan/plugins/gcrypt/Makefile.am
index a468a5ed9093d4428cd93dde55df8ef9cd879212..68939666431ed5fcad708b3af43888b4ea457898 100644 (file)
--- a/src/libstrongswan/plugins/gcrypt/Makefile.am
+++ b/src/libstrongswan/plugins/gcrypt/Makefile.am
@@ -14,4 +14,4 @@ libstrongswan_gcrypt_la_SOURCES = gcrypt_plugin.h gcrypt_plugin.c \
        gcrypt_hasher.h gcrypt_hasher.c
 
 libstrongswan_gcrypt_la_LDFLAGS = -module -avoid-version
-libstrongswan_gcrypt_la_LIBADD  = -lgcrypt
+libstrongswan_gcrypt_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgcrypt

diff --git a/src/libstrongswan/plugins/gmp/Makefile.am b/src/libstrongswan/plugins/gmp/Makefile.am
index 1ab3583283630cdeb6d110b47301545c2343ee69..3e2e4d4fa93fa751882fc1108c43c06eb46c7e53 100644 (file)
--- a/src/libstrongswan/plugins/gmp/Makefile.am
+++ b/src/libstrongswan/plugins/gmp/Makefile.am
@@ -11,5 +11,5 @@ libstrongswan_gmp_la_SOURCES = gmp_plugin.h gmp_plugin.c \
   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 = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp
 

diff --git a/src/libstrongswan/plugins/hmac/Makefile.am b/src/libstrongswan/plugins/hmac/Makefile.am
index 1856cad2d094a3577714a9a310c067862824f279..0689bf0c06221b5b416f191bcadce883c26e141b 100644 (file)
--- a/src/libstrongswan/plugins/hmac/Makefile.am
+++ b/src/libstrongswan/plugins/hmac/Makefile.am
@@ -8,4 +8,5 @@ plugin_LTLIBRARIES = libstrongswan-hmac.la
 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
+libstrongswan_hmac_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/ldap/Makefile.am b/src/libstrongswan/plugins/ldap/Makefile.am
index 6ad073d972e42a0f767f29a0673b2b4ea970f53e..a5b46509ca94d3395fe3e71ed4ee1899415f710b 100644 (file)
--- a/src/libstrongswan/plugins/ldap/Makefile.am
+++ b/src/libstrongswan/plugins/ldap/Makefile.am
@@ -7,5 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-ldap.la
 
 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  = $(top_builddir)/src/libstrongswan/libstrongswan.la -lldap -llber
 

diff --git a/src/libstrongswan/plugins/md4/Makefile.am b/src/libstrongswan/plugins/md4/Makefile.am
index a47da2e8ef0248a2e355a241edcf66e4ab3c0ba7..fc920282697a0d7a2cd7acbb125af0ca9a22c4b3 100644 (file)
--- a/src/libstrongswan/plugins/md4/Makefile.am
+++ b/src/libstrongswan/plugins/md4/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-md4.la
 
 libstrongswan_md4_la_SOURCES = md4_plugin.h md4_plugin.c md4_hasher.c md4_hasher.h
 libstrongswan_md4_la_LDFLAGS = -module -avoid-version
+libstrongswan_md4_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/md5/Makefile.am b/src/libstrongswan/plugins/md5/Makefile.am
index ce0611c1386b95975b62a9b1d3f096a9213cdf29..9db317300ade627df004c49417e29e3dace16b4f 100644 (file)
--- a/src/libstrongswan/plugins/md5/Makefile.am
+++ b/src/libstrongswan/plugins/md5/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-md5.la
 
 libstrongswan_md5_la_SOURCES = md5_plugin.h md5_plugin.c md5_hasher.c md5_hasher.h
 libstrongswan_md5_la_LDFLAGS = -module -avoid-version
+libstrongswan_md5_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/mysql/Makefile.am b/src/libstrongswan/plugins/mysql/Makefile.am
index c64481fd58cb97f08fa981b5c79ae3fd7ce25681..760d8a33225690c748f9cac1775e4a22fefd68c4 100644 (file)
--- a/src/libstrongswan/plugins/mysql/Makefile.am
+++ b/src/libstrongswan/plugins/mysql/Makefile.am
@@ -8,5 +8,5 @@ plugin_LTLIBRARIES = libstrongswan-mysql.la
 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)
+libstrongswan_mysql_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(MYSQLLIB)
 

diff --git a/src/libstrongswan/plugins/openssl/Makefile.am b/src/libstrongswan/plugins/openssl/Makefile.am
index 25cc5aa1d46af65839844d0c8c03d3371bdbb3b6..a6d8ec0967237e4a8fa920c671e4bda6f8f0c83b 100644 (file)
--- a/src/libstrongswan/plugins/openssl/Makefile.am
+++ b/src/libstrongswan/plugins/openssl/Makefile.am
@@ -17,5 +17,5 @@ libstrongswan_openssl_la_SOURCES = openssl_plugin.h openssl_plugin.c \
        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 = $(top_builddir)/src/libstrongswan/libstrongswan.la -lcrypto
 

diff --git a/src/libstrongswan/plugins/padlock/Makefile.am b/src/libstrongswan/plugins/padlock/Makefile.am
index b2b1f9d85fbbaf294a14bb50d44bbfe92442816c..837129e716d9908a5b0449e31e1150771a923c96 100644 (file)
--- a/src/libstrongswan/plugins/padlock/Makefile.am
+++ b/src/libstrongswan/plugins/padlock/Makefile.am
@@ -10,4 +10,5 @@ libstrongswan_padlock_la_SOURCES = padlock_plugin.h padlock_plugin.c \
        padlock_sha1_hasher.c padlock_sha1_hasher.h \
        padlock_rng.c padlock_rng.h
 libstrongswan_padlock_la_LDFLAGS = -module -avoid-version
+libstrongswan_padlock_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/pem/Makefile.am b/src/libstrongswan/plugins/pem/Makefile.am
index 98f356aafa6669f4058622ffba050be93833c30d..36dfd527a818957087941f01e1c4f16f4d59422e 100644 (file)
--- a/src/libstrongswan/plugins/pem/Makefile.am
+++ b/src/libstrongswan/plugins/pem/Makefile.am
@@ -9,4 +9,5 @@ libstrongswan_pem_la_SOURCES = pem_plugin.h pem_plugin.c \
   pem_builder.c pem_builder.h
 
 libstrongswan_pem_la_LDFLAGS = -module -avoid-version
+libstrongswan_pem_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/pgp/Makefile.am b/src/libstrongswan/plugins/pgp/Makefile.am
index c232971bb54cc6d45131c71d0fbc87f4f332e319..e99e718461e968e7549d77a0bcb728769a0988bb 100644 (file)
--- a/src/libstrongswan/plugins/pgp/Makefile.am
+++ b/src/libstrongswan/plugins/pgp/Makefile.am
@@ -12,4 +12,5 @@ libstrongswan_pgp_la_SOURCES = pgp_plugin.h pgp_plugin.c \
   pgp_builder.h pgp_builder.c
 
 libstrongswan_pgp_la_LDFLAGS = -module -avoid-version
+libstrongswan_pgp_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/pkcs1/Makefile.am b/src/libstrongswan/plugins/pkcs1/Makefile.am
index 88d25a26b162da49063979224b86af7b0009a37b..8a0cd7881ef1dc6cd3e47e250d85ed9674b07194 100644 (file)
--- a/src/libstrongswan/plugins/pkcs1/Makefile.am
+++ b/src/libstrongswan/plugins/pkcs1/Makefile.am
@@ -10,4 +10,5 @@ libstrongswan_pkcs1_la_SOURCES = pkcs1_plugin.h pkcs1_plugin.c \
   pkcs1_builder.h pkcs1_builder.c
 
 libstrongswan_pkcs1_la_LDFLAGS = -module -avoid-version
+libstrongswan_pkcs1_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/pubkey/Makefile.am b/src/libstrongswan/plugins/pubkey/Makefile.am
index 770d773255fd4bd7b191663c449125e70ecd2ed6..474357b42f29f4827a7087f10f2f6de8c86217ec 100644 (file)
--- a/src/libstrongswan/plugins/pubkey/Makefile.am
+++ b/src/libstrongswan/plugins/pubkey/Makefile.am
@@ -9,4 +9,5 @@ libstrongswan_pubkey_la_SOURCES = pubkey_plugin.h pubkey_plugin.c \
   pubkey_cert.h pubkey_cert.c
 
 libstrongswan_pubkey_la_LDFLAGS = -module -avoid-version
+libstrongswan_pubkey_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/random/Makefile.am b/src/libstrongswan/plugins/random/Makefile.am
index 7c2283ae726204d0e52132d916a63ec08a20bc77..760267d42b7d290352714f8a18919ae0d8ca3754 100644 (file)
--- a/src/libstrongswan/plugins/random/Makefile.am
+++ b/src/libstrongswan/plugins/random/Makefile.am
@@ -10,4 +10,5 @@ plugin_LTLIBRARIES = libstrongswan-random.la
 libstrongswan_random_la_SOURCES = random_plugin.h random_plugin.c \
   random_rng.c random_rng.h
 libstrongswan_random_la_LDFLAGS = -module -avoid-version
+libstrongswan_random_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/sha1/Makefile.am b/src/libstrongswan/plugins/sha1/Makefile.am
index ead51a45a71b25c4e07acd4168feadd23d2c9c56..7165bb2cccb795bd35052a16a1daea514f4853ad 100644 (file)
--- a/src/libstrongswan/plugins/sha1/Makefile.am
+++ b/src/libstrongswan/plugins/sha1/Makefile.am
@@ -8,4 +8,5 @@ plugin_LTLIBRARIES = libstrongswan-sha1.la
 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
+libstrongswan_sha1_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/sha2/Makefile.am b/src/libstrongswan/plugins/sha2/Makefile.am
index 5422e1d4e8639aa05cf16fdf4890b708d989d106..d8c2fa25fe5e8592fa4cda7b89ff206a37ba2a16 100644 (file)
--- a/src/libstrongswan/plugins/sha2/Makefile.am
+++ b/src/libstrongswan/plugins/sha2/Makefile.am
@@ -7,4 +7,5 @@ plugin_LTLIBRARIES = libstrongswan-sha2.la
 
 libstrongswan_sha2_la_SOURCES = sha2_plugin.h sha2_plugin.c sha2_hasher.c sha2_hasher.h
 libstrongswan_sha2_la_LDFLAGS = -module -avoid-version
+libstrongswan_sha2_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/sqlite/Makefile.am b/src/libstrongswan/plugins/sqlite/Makefile.am
index f26e3129449b37d0c222c7002cec394cd8793ed7..a3bfea9be7739b0ee7b5cd82741c8372f785ad40 100644 (file)
--- a/src/libstrongswan/plugins/sqlite/Makefile.am
+++ b/src/libstrongswan/plugins/sqlite/Makefile.am
@@ -8,5 +8,5 @@ plugin_LTLIBRARIES = libstrongswan-sqlite.la
 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
+libstrongswan_sqlite_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lsqlite3
 

diff --git a/src/libstrongswan/plugins/test_vectors/Makefile.am b/src/libstrongswan/plugins/test_vectors/Makefile.am
index 6028805c4b3659db55e58ec23b9423743484f112..82e93a1eb7f7bd0fe4429970ac5dccbbe4f7f1b0 100644 (file)
--- a/src/libstrongswan/plugins/test_vectors/Makefile.am
+++ b/src/libstrongswan/plugins/test_vectors/Makefile.am
@@ -30,4 +30,5 @@ libstrongswan_test_vectors_la_SOURCES = \
        test_vectors/fips_prf.c \
        test_vectors/rng.c
 libstrongswan_test_vectors_la_LDFLAGS = -module -avoid-version
+libstrongswan_test_vectors_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/x509/Makefile.am b/src/libstrongswan/plugins/x509/Makefile.am
index 853b1cebcea859999c84515a1580e0894cc5c950..838a62ccfa650caddef3b7b87b7f629f9748d59b 100644 (file)
--- a/src/libstrongswan/plugins/x509/Makefile.am
+++ b/src/libstrongswan/plugins/x509/Makefile.am
@@ -13,4 +13,5 @@ libstrongswan_x509_la_SOURCES = x509_plugin.h x509_plugin.c \
   x509_ocsp_request.h x509_ocsp_request.c \
   x509_ocsp_response.h x509_ocsp_response.c
 libstrongswan_x509_la_LDFLAGS = -module -avoid-version
+libstrongswan_x509_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 

diff --git a/src/libstrongswan/plugins/xcbc/Makefile.am b/src/libstrongswan/plugins/xcbc/Makefile.am
index 515b7503124a25fa6504f924bee7f770f81f91ea..315b971d8223e7f3a944a5f58d8256d52a1ff843 100644 (file)
--- a/src/libstrongswan/plugins/xcbc/Makefile.am
+++ b/src/libstrongswan/plugins/xcbc/Makefile.am
@@ -8,4 +8,5 @@ plugin_LTLIBRARIES = libstrongswan-xcbc.la
 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
+libstrongswan_xcbc_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la