]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
Reverting eba28948a584b9d02474cf5d256b04b8d2adbe6a which was only necessary when...
authorTobias Brunner <tobias@strongswan.org>
Tue, 2 Mar 2010 11:03:44 +0000 (12:03 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 2 Mar 2010 11:03:44 +0000 (12:03 +0100)
With the coming monolithic build using Android.mk files this won't be
necessary anymore.

59 files changed:
src/charon/plugins/android/Makefile.am
src/charon/plugins/attr/Makefile.am
src/charon/plugins/eap_aka/Makefile.am
src/charon/plugins/eap_aka_3gpp2/Makefile.am
src/charon/plugins/eap_gtc/Makefile.am
src/charon/plugins/eap_identity/Makefile.am
src/charon/plugins/eap_md5/Makefile.am
src/charon/plugins/eap_mschapv2/Makefile.am
src/charon/plugins/eap_radius/Makefile.am
src/charon/plugins/eap_sim/Makefile.am
src/charon/plugins/eap_sim_file/Makefile.am
src/charon/plugins/eap_simaka_pseudonym/Makefile.am
src/charon/plugins/eap_simaka_reauth/Makefile.am
src/charon/plugins/kernel_klips/Makefile.am
src/charon/plugins/kernel_netlink/Makefile.am
src/charon/plugins/kernel_pfkey/Makefile.am
src/charon/plugins/kernel_pfroute/Makefile.am
src/charon/plugins/load_tester/Makefile.am
src/charon/plugins/medcli/Makefile.am
src/charon/plugins/medsrv/Makefile.am
src/charon/plugins/nm/Makefile.am
src/charon/plugins/resolve/Makefile.am
src/charon/plugins/smp/Makefile.am
src/charon/plugins/socket_default/Makefile.am
src/charon/plugins/socket_dynamic/Makefile.am
src/charon/plugins/socket_raw/Makefile.am
src/charon/plugins/sql/Makefile.am
src/charon/plugins/stroke/Makefile.am
src/charon/plugins/uci/Makefile.am
src/charon/plugins/unit_tester/Makefile.am
src/charon/plugins/updown/Makefile.am
src/libstrongswan/plugins/aes/Makefile.am
src/libstrongswan/plugins/agent/Makefile.am
src/libstrongswan/plugins/attr_sql/Makefile.am
src/libstrongswan/plugins/blowfish/Makefile.am
src/libstrongswan/plugins/curl/Makefile.am
src/libstrongswan/plugins/des/Makefile.am
src/libstrongswan/plugins/dnskey/Makefile.am
src/libstrongswan/plugins/fips_prf/Makefile.am
src/libstrongswan/plugins/gcrypt/Makefile.am
src/libstrongswan/plugins/gmp/Makefile.am
src/libstrongswan/plugins/hmac/Makefile.am
src/libstrongswan/plugins/ldap/Makefile.am
src/libstrongswan/plugins/md4/Makefile.am
src/libstrongswan/plugins/md5/Makefile.am
src/libstrongswan/plugins/mysql/Makefile.am
src/libstrongswan/plugins/openssl/Makefile.am
src/libstrongswan/plugins/padlock/Makefile.am
src/libstrongswan/plugins/pem/Makefile.am
src/libstrongswan/plugins/pgp/Makefile.am
src/libstrongswan/plugins/pkcs1/Makefile.am
src/libstrongswan/plugins/pubkey/Makefile.am
src/libstrongswan/plugins/random/Makefile.am
src/libstrongswan/plugins/sha1/Makefile.am
src/libstrongswan/plugins/sha2/Makefile.am
src/libstrongswan/plugins/sqlite/Makefile.am
src/libstrongswan/plugins/test_vectors/Makefile.am
src/libstrongswan/plugins/x509/Makefile.am
src/libstrongswan/plugins/xcbc/Makefile.am

index 1e428b07a18b0f48192e709ff30ceb73318db9bd..a7024eaa900f91d9b1320748fe55351bfc318e6d 100644 (file)
@@ -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
index 98d9694ca99a16ee301890e67c8051714dc76997..6ba220abbfad043ef94cfe237b8fbdf7beacddcb 100644 (file)
@@ -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 = \
index ddeacc5f08e394be8e3abb8adb0d552759ad09b6..c7ce8d96bb1801c5f9e24d3ad7ff422759485288 100644 (file)
@@ -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 = \
index 5a376695755dfbc3148e63fc9c36e9e1717ba6c0..6bab07c177e978eb95918d1da0be6c316187e9af 100644 (file)
@@ -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
index 8f0fea76d75604774f21a1dd4ae537f69ce2e3bf..e87f5e8999853aa24ff59cd551091d47bc2c9390 100644 (file)
@@ -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 = \
index 428ad396b32038501e2251a641d9c3da79dcbd67..f743f356641b35de0dd7432a1bff7b4e6258748c 100644 (file)
@@ -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 = \
index 838b1f4745c14f9b4dd31a91ad74b0c6ce58e48a..76b039b282000398ce11f6ccc327e9bfdb6c2b4e 100644 (file)
@@ -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 = \
index 08c862cd8578e9b8a5f05e9cbd151ed853765dab..3a2b6e211885eb6de29af51be970a56658120f21 100644 (file)
@@ -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 = \
index f9e37a7db8d068cf57d81d39c477f61fe2805037..9f1405469fb049caa294b0b83ef241ec8320df58 100644 (file)
@@ -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 = \
index 82e8ba7aa5999c338cdfd718094a9870dabbf4a0..ddadebcfea91a87f4da700f753bc38f9db6156f2 100644 (file)
@@ -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 = \
index 80c3f23740f2c65aa71104e3d627ad46d1c6ba3f..544883003a5c1c76b8330e29d5f442b947329b53 100644 (file)
@@ -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 = \
index ce131471b43e60b0b6b5bc803f480384829918cd..1e88828267cd5c23f34e49cef1f18823e765ef69 100644 (file)
@@ -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 = \
index 958792555aa60f9895fe979f53276fdc283764f7..9196784321e887e0e5f768b835b4d787203fd69c 100644 (file)
@@ -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 = \
index e8d31c51d28b29a6e3dc7ea6294c51b17c78c02d..74c3caa098332e4423fc8c6bbd2d3f90ddf9483f 100644 (file)
@@ -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 = \
index c768cd563886ebf45332eaacb68963545387e124..eda872882deb4039d8c71b84d0fe344f90aff333 100644 (file)
@@ -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 = \
index f621404ef4782373db2886b6ec29b0661f774ea8..2c7641e5f679bf9abcd13f4bb0e5805a5ab9aa8b 100644 (file)
@@ -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 = \
index b5249a92b834a97153bdd7c52ecd7f1287cfe195..05499f070d946a4f1789e09d51ce2b0ed8186b14 100644 (file)
@@ -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 = \
index cc2c6fc55c9534fa085a7c25f697f1e474396f57..090b0baf693a9e0c7a007a3f4d4952394ba62d05 100644 (file)
@@ -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 = \
index acfa3190ddd5e75c2636b9b6d89cef927c99e6b1..e1e3dc53aa603bf856ef631afba5bf8a6c94178a 100644 (file)
@@ -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 = \
index 9f547631e1ac4820d3fd2e7409275c25d8fc68d2..9775c098c74092d619cba261a1a7cc12860007c1 100644 (file)
@@ -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 = \
index cabbe89ccb1c31f970fafbd194894a8680cd51a8..a6d29dea6165fc8054f177878586e3ec1485754c 100644 (file)
@@ -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}
index f7f861fba3d1843d72aa23cda9929a8505d15eca..04e61c342a9fa9d842ff4bbf990159de421bf8d8 100644 (file)
@@ -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 = \
index aa56ab43341133f23352a271323adaf40ae4a675..4e71419001f97c9d7df5c1b3ff5ef32dd39e1558 100644 (file)
@@ -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}
index 4eb5734da3ab9725b2873ca1fa11631005d79164..6b1ee2fee37bc5c7c1443aa46c5a7512520e5ad0 100644 (file)
@@ -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 = \
index b9ef24da65a2247a8a6d197ee3d3bde5d2878b2f..546db5c16df60d55ad2782e54bc1c2ba37166685 100644 (file)
@@ -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 = \
index f3682c832966536809a4868981850836fb5c46ee..896cd0c11c405c201f51ff1d60f21d042086d845 100644 (file)
@@ -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 = \
index c83b7b033041be15e017788a12f4289744277ead..ece07f5383f5e888baf479cc6dd59019a2eef478 100644 (file)
@@ -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 = \
index 81c9e7fcef9e4604eea3c01384a85f505a44375a..36e0d8280463785b9c1a826489d3105551822bfb 100644 (file)
@@ -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 = \
index 7ca54c18e16e4e2ed8f011198313868dc54b391c..ccaecc6bcc162cb8b9a643172c42b9b7d65466c1 100644 (file)
@@ -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
index 758740cd7f0a8ab3cd5359588e33f95afa87b662..c0307e06f2e74d021b8cc1c461baeb4c5de8bea1 100644 (file)
@@ -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 = \
index a54e537a20e16726f6f649c5ec5cba479b70a8f8..1de2946bf75f0d7c92ab493d1ee4b832a5939f28 100644 (file)
@@ -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 = \
index 5f7629bb12f7126775a24a7e8602798d42f55963..e72daeb44a83aa5e07ac9b97fb3837a677152354 100644 (file)
@@ -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 = \
index 6273dce70a83f8c1dc12c40399278ee6660e17a8..ffa6e8b7f9229c50da5c4111ddc3c15caca1e5d6 100644 (file)
@@ -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 = \
index eb3eae4474aeb243369edd3c2accfd13f27d0597..9d73f2e9b65d1707ec26feba61e92a6d001e6529 100644 (file)
@@ -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 = \
index 3d560a750aacbd7c2a91bd6b45a66acc6bc26fae..95c414204f386411df65b49f156a2b0c2dbb5ea4 100644 (file)
@@ -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 = \
index c9460451b14c2d2145b371d7521d0cc3b893fa39..43718f678854cf12c01cdc555e7d66a46a99fc2b 100644 (file)
@@ -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
index 91be7597ac4d9a70405d9ad0666b4b2e5824cd14..c7d9ce915ee153abec9f7feac34c850ba12c161a 100644 (file)
@@ -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 = \
index 68803f679080ba6edba6358c31c28da3079afdbf..fbba95e0aef9666a4f866ed0876be89d95623043 100644 (file)
@@ -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 = \
index 42872cc2b7efa68e44e9022ae297b9bc67e120f3..c9cf2c9774944a3511090b0817b2c5b67d10a3a9 100644 (file)
@@ -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 = \
index beabc4f14837a18a8a39a412469e9660cc073c1f..48bf916abece7c88b57c07c3108842d3f8f0437a 100644 (file)
@@ -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
index 05ad0e7669cc811b69a847d6140b4528def14aa6..cc8ad34db1d061921a126b19ef4dc94ff91a73cc 100644 (file)
@@ -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
index ee40ddb8d4625c1ac18b33dc159590fd84f7500e..77aa0ffd1f01480b0a5a0c1c7b0fca7d5e92252c 100644 (file)
@@ -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 = \
index 42525bca2ea2f1f9f4ff702ed35d10ded35fd846..2b2f7d31dd0a0dbbb480db52947e85c728579a5b 100644 (file)
@@ -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
index d505419d469e8eab0b8eed4a2fe05b389180357a..904af70c08ccddc82913f51d033cf0fffef789d5 100644 (file)
@@ -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 = \
index 8c8a1a245be5166a780afd7038c2189752daa3d5..b2eb2abd2c488cefc8a1695727853cb97813a608 100644 (file)
@@ -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 = \
index dc5cee1d23bfcf58af3913c8a5ce589562f3956f..801a7a7be14d9d02987c61f247a6d84594ec7379 100644 (file)
@@ -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)
 
index a5404b2074e8ef47e63a402c791a5a2e610e4181..eee1ca5c02adb2bae371490b5e8cf5ca465a17c5 100644 (file)
@@ -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
 
index 8ebb57bb950480d18262387dd92e6681bb4f9221..6706d26cb8b3644a8379a0752f2adb4aeb4ad5d8 100644 (file)
@@ -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 = \
index 7acd30b38a39c01fa9ec0c07b187551e064fc840..f43423a8558155bc4c9d44a13beb06487a53a1d5 100644 (file)
@@ -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 = \
index 6bf4249bbc6db2776630f8dcb738f33ba7f08ea9..4b414616d61f0644f644fd206a2b441d3e09f447 100644 (file)
@@ -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 = \
index abb271dfe8527fce1215c05083834309b170daeb..bd3203dae9d6fc480267389bfacef90b11b1d14c 100644 (file)
@@ -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 = \
index 84baaf0106fca0507ad0a0de13bcb96a68003f14..c2974a585d3c08ba6708d11941c7caaabdebed8f 100644 (file)
@@ -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 = \
index 1e9df763bca75c7b528c28b5ea28e86a666e9c4f..5df99271816fb2310b1691d6f4acb301052e4aaf 100644 (file)
@@ -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 = \
index a63981633ef7d583c8d4492c8c5ba5611f7026bf..4e539fd83759fdcb2951ed54035e6bdbbfa49428 100644 (file)
@@ -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 = \
index 9fc4b77cf55f3b2a07009d0e2c6203e8d7174027..a255d06094829d3e170408ae1dccb1f5e90d0c82 100644 (file)
@@ -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 = \
index 7ac15963aeb7486b5cec32dfe63b1323399bb668..2e1d9733f9a933abf418c863522b30fa4c0ae799 100644 (file)
@@ -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
 
index d1bdb72ae9d07108f0386e4f2ec0ddcdf5c9239e..6d3b05d191eeaa0568aa5854e862773d99399156 100644 (file)
@@ -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 = \
index 7e3ad1dd68cf20ff6692ff7d015401b81dcc910f..4b50d78dcb79050d38f72f22d718c7499a6ae165 100644 (file)
@@ -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 = \
index 6cf001a1b6c5f8e059e442874253fbacfcddf46c..7de306832e758b569d24e504010eead3d257de77 100644 (file)
@@ -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 = \