>From 902f3d52f9ea3b4dc889b86cfd42f0f28b0d6e5e Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Sat, 15 Mar 2014 17:29:25 +0100 Subject: [PATCH 5/6] BUILD: Move duplicated files from providers to libsss_ldap_common.so Files sss_ldap.c, user_info_msg.c were built in libsss_{ad,ipa,ldap}.so. In these two files, there are functions sss_ldap_get_diagnostic_msg, pack_user_info_chpass_error which are needed in libsss_ldap_common.so sss_ldap_get_diagnostic_msg is used in src/providers/ldap/sdap_async.c, src/providers/ldap/sdap_async_connection.c pack_user_info_chpass_error is used in src/providers/ldap/ldap_auth.c --- Makefile.am | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index ac9d7927358b44d34958900d3eea4959f7fae85c..a65369be7f1b9a1970e9937a6a352ae01f5031ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1559,8 +1559,6 @@ test_utils_LDADD = \ test_search_bases_SOURCES = \ $(sssd_be_SOURCES) \ - src/util/sss_ldap.c \ - src/util/user_info_msg.c \ src/tests/cmocka/test_search_bases.c test_search_bases_CFLAGS = \ $(AM_CFLAGS) \ @@ -1580,8 +1578,6 @@ test_search_bases_LDADD = \ ad_access_filter_tests_SOURCES = \ $(sssd_be_SOURCES) \ - src/util/sss_ldap.c \ - src/util/user_info_msg.c \ src/providers/ad/ad_common.c \ src/tests/cmocka/test_ad_access_filter.c ad_access_filter_tests_CFLAGS = \ @@ -1601,8 +1597,6 @@ ad_access_filter_tests_LDADD = \ ad_common_tests_SOURCES = \ $(sssd_be_SOURCES) \ - src/util/sss_ldap.c \ - src/util/user_info_msg.c \ src/tests/cmocka/test_ad_common.c ad_common_tests_CFLAGS = \ $(AM_CFLAGS) \ @@ -1748,6 +1742,10 @@ endif # Plugin Libraries # #################### +# libsss_krb5_common must be installed before libsss_ldap_common +# because libtool tries to relink libsss_ldap_common when installing +# libsss_ldap_common and therefore make distcheck fails +pkglib_LTLIBRARIES += libsss_krb5_common.la pkglib_LTLIBRARIES += libsss_ldap_common.la libsss_ldap_common_la_SOURCES = \ src/providers/ldap/ldap_id.c \ @@ -1781,8 +1779,14 @@ libsss_ldap_common_la_SOURCES = \ src/providers/ldap/sdap_refresh.c \ src/providers/ldap/sdap_utils.c \ src/providers/ldap/sdap_domain.c \ - src/providers/ldap/sdap.c + src/providers/ldap/sdap.c \ + src/util/user_info_msg.c \ + src/util/sss_ldap.c +libsss_ldap_common_la_CFLAGS = \ + $(KRB5_CFLAGS) libsss_ldap_common_la_LIBADD = \ + $(KRB5_LIBS) \ + libsss_krb5_common.la \ libsss_idmap.la libsss_ldap_common_la_LDFLAGS = \ -avoid-version @@ -1802,11 +1806,7 @@ libsss_ldap_common_la_SOURCES += \ src/providers/ldap/sdap_async_autofs.c endif -libsss_ldap_common_la_CFLAGS = \ - $(KRB5_CFLAGS) - -pkglib_LTLIBRARIES += libsss_krb5_common.la libsss_krb5_common_la_SOURCES = \ src/providers/krb5/krb5_utils.c \ src/providers/krb5/krb5_become_user.c \ @@ -1830,9 +1830,7 @@ libsss_krb5_common_la_LDFLAGS = \ libsss_ldap_la_SOURCES = \ src/providers/ldap/ldap_init.c \ - src/providers/ldap/ldap_access.c \ - src/util/user_info_msg.c \ - src/util/sss_ldap.c + src/providers/ldap/ldap_access.c libsss_ldap_la_CFLAGS = \ $(AM_CFLAGS) \ $(OPENLDAP_CFLAGS) @@ -1918,9 +1916,7 @@ libsss_ipa_la_SOURCES = \ src/providers/ad/ad_dyndns.c \ src/providers/ad/ad_id.c \ src/providers/ad/ad_srv.c \ - src/providers/ad/ad_domain_info.c \ - src/util/user_info_msg.c \ - src/util/sss_ldap.c + src/providers/ad/ad_domain_info.c libsss_ipa_la_CFLAGS = \ $(AM_CFLAGS) \ $(OPENLDAP_CFLAGS) \ @@ -1970,9 +1966,7 @@ libsss_ad_la_SOURCES = \ src/providers/ad/ad_subdomains.c \ src/providers/ad/ad_subdomains.h \ src/providers/ad/ad_domain_info.c \ - src/providers/ad/ad_domain_info.h \ - src/util/user_info_msg.c \ - src/util/sss_ldap.c + src/providers/ad/ad_domain_info.h if BUILD_SUDO libsss_ad_la_SOURCES += \ -- 1.8.5.3