diff options
Diffstat (limited to 'src/libstrongswan')
28 files changed, 7 insertions, 42 deletions
diff --git a/src/libstrongswan/plugins/aes/Makefile.am b/src/libstrongswan/plugins/aes/Makefile.am index 5f7629bb1..e72daeb44 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 6273dce70..ffa6e8b7f 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 eb3eae447..9d73f2e9b 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 3d560a750..95c414204 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 c9460451b..43718f678 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 91be7597a..c7d9ce915 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 68803f679..fbba95e0a 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 42872cc2b..c9cf2c977 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 beabc4f14..48bf916ab 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 05ad0e766..cc8ad34db 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 ee40ddb8d..77aa0ffd1 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 42525bca2..2b2f7d31d 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 d505419d4..904af70c0 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 8c8a1a245..b2eb2abd2 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 dc5cee1d2..801a7a7be 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 a5404b207..eee1ca5c0 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 8ebb57bb9..6706d26cb 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 7acd30b38..f43423a85 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 6bf4249bb..4b414616d 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 abb271dfe..bd3203dae 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 84baaf010..c2974a585 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 1e9df763b..5df992718 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 a63981633..4e539fd83 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 9fc4b77cf..a255d0609 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 7ac15963a..2e1d9733f 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 d1bdb72ae..6d3b05d19 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 7e3ad1dd6..4b50d78dc 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 6cf001a1b..7de306832 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 = \ |