>From 2ccba2c21c682cd3f1190f176f6a6fd0fc51e1c3 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Mon, 11 Nov 2013 19:35:13 +0100 Subject: [PATCH 2/3] BUILD: move file find_uid.c into libsss_util.so --- Makefile.am | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 102797cec02161b0553c2adb3cbf19e83fd50be0..6e1ea72a73e7254c653934006471baf469481fc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -590,9 +590,14 @@ libsss_util_la_SOURCES = \ src/util/util_errors.c \ src/util/sss_ini.c \ src/util/io.c \ - src/util/util_sss_idmap.c + src/util/util_sss_idmap.c \ + src/util/find_uid.c +libsss_util_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SYSTEMD_LOGIN_CFLAGS) libsss_util_la_LIBADD = \ $(SSSD_LIBS) \ + $(SYSTEMD_LOGIN_LIBS) \ $(UNICODE_LIBS) if BUILD_SUDO libsss_util_la_SOURCES += src/db/sysdb_sudo.c @@ -784,16 +789,13 @@ sss_useradd_LDADD = \ sss_userdel_SOURCES = \ src/tools/sss_userdel.c \ - src/util/find_uid.c \ $(SSSD_LCL_TOOLS_OBJ) sss_userdel_LDADD = \ $(TOOLS_LIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ $(CLIENT_LIBS) sss_userdel_CFLAGS = \ - $(AM_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) + $(AM_CFLAGS) sss_groupadd_SOURCES = \ src/tools/sss_groupadd.c \ @@ -987,21 +989,18 @@ krb5_utils_tests_SOURCES = \ src/providers/krb5/krb5_become_user.c \ src/providers/krb5/krb5_common.c \ src/util/sss_krb5.c \ - src/util/find_uid.c \ src/providers/data_provider_fo.c \ src/providers/data_provider_opts.c \ src/providers/data_provider_callbacks.c \ $(SSSD_FAILOVER_OBJ) krb5_utils_tests_CFLAGS = \ $(AM_CFLAGS) \ - $(CHECK_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) + $(CHECK_CFLAGS) krb5_utils_tests_LDADD = \ $(SSSD_LIBS)\ $(CARES_LIBS) \ $(KRB5_LIBS) \ $(CHECK_LIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ libsss_test_common.la @@ -1251,7 +1250,6 @@ krb5_child_test_SOURCES = \ src/providers/krb5/krb5_become_user.c \ src/providers/krb5/krb5_common.c \ src/util/sss_krb5.c \ - src/util/find_uid.c \ src/providers/data_provider_fo.c \ src/providers/data_provider_opts.c \ src/providers/data_provider_callbacks.c \ @@ -1259,14 +1257,12 @@ krb5_child_test_SOURCES = \ krb5_child_test_CFLAGS = \ $(AM_CFLAGS) \ -DKRB5_CHILD_DIR=\"$(builddir)\" \ - $(CHECK_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) + $(CHECK_CFLAGS) krb5_child_test_LDADD = \ $(SSSD_LIBS) \ $(CARES_LIBS) \ $(KRB5_LIBS) \ $(CHECK_LIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ libsss_test_common.la @@ -1392,12 +1388,10 @@ ad_access_filter_tests_SOURCES = \ $(sssd_be_SOURCES) \ src/util/sss_ldap.c \ src/util/sss_krb5.c \ - src/util/find_uid.c \ src/util/user_info_msg.c \ src/tests/cmocka/test_ad_access_filter.c ad_access_filter_tests_CFLAGS = \ $(AM_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) \ -DUNIT_TESTING ad_access_filter_tests_LDADD = \ $(PAM_LIBS) \ @@ -1406,7 +1400,6 @@ ad_access_filter_tests_LDADD = \ $(CARES_LIBS) \ $(KRB5_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ libsss_ldap_common.la \ libsss_idmap.la \ libsss_krb5_common.la \ @@ -1606,14 +1599,12 @@ libsss_ldap_la_SOURCES = \ src/util/sss_krb5.c libsss_ldap_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) \ $(OPENLDAP_CFLAGS) \ $(KRB5_CFLAGS) libsss_ldap_la_LIBADD = \ $(OPENLDAP_LIBS) \ $(DHASH_LIBS) \ $(KRB5_LIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ libsss_ldap_common.la \ libsss_idmap.la libsss_ldap_la_LDFLAGS = \ @@ -1749,21 +1740,18 @@ libsss_ad_la_SOURCES = \ src/providers/ad/ad_subdomains.h \ src/providers/ad/ad_domain_info.c \ src/providers/ad/ad_domain_info.h \ - src/util/find_uid.c \ src/util/user_info_msg.c \ src/util/sss_krb5.c \ src/util/sss_ldap.c libsss_ad_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) \ $(OPENLDAP_CFLAGS) \ $(SASL_CFLAGS) \ $(DHASH_CFLAGS) \ $(KRB5_CFLAGS) \ $(NDR_NBT_CFLAGS) libsss_ad_la_LIBADD = \ - $(SYSTEMD_LOGIN_LIBS) \ $(OPENLDAP_LIBS) \ $(SASL_LIBS) \ $(DHASH_LIBS) \ -- 1.8.3.1