>From 0958f3b6306ce7330e49b1ae0a8abcd2150485a4 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 3 Dec 2014 13:57:24 +0100 Subject: [PATCH 2/2] UTIL: Fix dependencies of internal sss libraries --- Makefile.am | 15 ++++++++++++++- src/tests/dlopen-tests.c | 14 +++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 24ab21790cae0a87fa2ea075a23043b0cb70e308..25e8bee0747618aa4def8c11ed90eb3ed9a793e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -316,7 +316,11 @@ libsss_crypt_la_CFLAGS = \ $(SSS_CRYPT_CFLAGS) \ $(DHASH_CFLAGS) libsss_crypt_la_LIBADD = \ - $(SSS_CRYPT_LIBS) + $(SSS_CRYPT_LIBS) \ + $(DHASH_LIBS) \ + $(TALLOC_LIBS) \ + libsss_debug.la \ + $(NULL) libsss_crypt_la_LDFLAGS = \ -avoid-version @@ -667,6 +671,12 @@ libsss_debug_la_LDFLAGS = \ pkglib_LTLIBRARIES += libsss_child.la libsss_child_la_SOURCES = src/util/child_common.c +libsss_child_la_LIBADD = \ + $(TALLOC_LIBS) \ + $(TEVENT_LIBS) \ + $(DHASH_LIBS) \ + libsss_debug.la \ + $(NULL) libsss_child_la_LDFLAGS = -avoid-version pkglib_LTLIBRARIES += libsss_util.la @@ -732,6 +742,9 @@ libsss_util_la_LIBADD = \ $(SSSD_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ $(UNICODE_LIBS) \ + libsss_debug.la \ + libsss_child.la \ + libsss_crypt.la \ $(NULL) if BUILD_SUDO libsss_util_la_SOURCES += src/db/sysdb_sudo.c diff --git a/src/tests/dlopen-tests.c b/src/tests/dlopen-tests.c index 7e56d652461155045023fddeb988f4f4ba017277..5cc6cae693f09adae12df0d2267e0868ae2f74c0 100644 --- a/src/tests/dlopen-tests.c +++ b/src/tests/dlopen-tests.c @@ -71,18 +71,10 @@ struct so { { "cifs_idmap_sss.so", { LIBPFX"cifs_idmap_sss.so", NULL } }, #endif { "memberof.so", { LIBPFX"memberof.so", NULL } }, - { "libsss_child.so", { "libtevent.so", - LIBPFX"libsss_debug.so", - LIBPFX"libsss_crypt.so", - LIBPFX"libsss_util.so", + { "libsss_child.so", { LIBPFX"libsss_util.so", LIBPFX"libsss_child.so", NULL } }, - { "libsss_crypt.so", { "libtalloc.so", - LIBPFX"libsss_debug.so", - LIBPFX"libsss_crypt.so", NULL } }, - { "libsss_util.so", { "libtalloc.so", - LIBPFX"libsss_debug.so", - LIBPFX"libsss_crypt.so", - LIBPFX"libsss_util.so", NULL } }, + { "libsss_crypt.so", { LIBPFX"libsss_crypt.so", NULL } }, + { "libsss_util.so", { LIBPFX"libsss_util.so", NULL } }, { "libsss_simple.so", { LIBPFX"libdlopen_test_providers.so", LIBPFX"libsss_simple.so", NULL } }, #ifdef BUILD_SAMBA -- 2.1.0