From 5a05b6127064c74349f1edae32e5e13032c386fe Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Wed, 3 Dec 2014 13:57:24 +0100
Subject: UTIL: Fix dependencies of internal sss libraries

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
---
 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 80564d604..85699d11e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -319,7 +319,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
 
@@ -670,6 +674,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
@@ -735,6 +745,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 7e56d6524..5cc6cae69 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
-- 
cgit