[SSSD] [PATCH] Replace prog_DEPENDENCIES with EXTRA_prog_DEPENDENCIES

Lukas Slebodnik lslebodn at redhat.com
Mon Nov 11 08:24:17 UTC 2013


On (08/11/13 15:01), Sumit Bose wrote:
>Hi,
>
>I was fighting with some failing unit tests until I discovered that some
>build dependencies were not re-compiled although I've modified them.
>After some further digging I came across prog_DEPENDENCIES and
>EXTRA_prog_DEPENDENCIES. See commit message and
>http://www.gnu.org/software/automake/manual/html_node/Linking.html for
>further details.
>
>bye,
>Sumit

Nice catch.

>From a2b6c827cdf83372324081f0a63f02ca89fc990a Mon Sep 17 00:00:00 2001
>From: Sumit Bose <sbose at redhat.com>
>Date: Fri, 8 Nov 2013 14:51:34 +0100
>Subject: [PATCH] Replace prog_DEPENDENCIES with EXTRA_prog_DEPENDENCIES
>
>Automake computes build dependencies of a program automatically but not
>if prog_DEPENDENCIES is set. In this case only the dependencies given by
>prog_DEPENDENCIES are used. If the automatically calculated dependencies
>should be augmented EXTRA_prog_DEPENDENCIES should be used.
>---
> Makefile.am | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index e9bed47..7d9a8ad 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -943,7 +943,7 @@ dlopen_tests_LDADD = \
>     $(LIBADD_DL) \
>     $(CHECK_LIBS)
> 
>-sysdb_tests_DEPENDENCIES = \
>+EXTRA_sysdb_tests_DEPENDENCIES = \
>     $(ldblib_LTLIBRARIES)
> sysdb_tests_SOURCES = \
>     src/tests/sysdb-tests.c
>@@ -956,7 +956,7 @@ sysdb_tests_LDADD = \
>     $(SSSD_INTERNAL_LTLIBS) \
>     libsss_test_common.la
> 
>-sysdb_ssh_tests_DEPENDENCIES = \
>+EXTRA_sysdb_ssh_tests_DEPENDENCIES = \
>     $(ldblib_LTLIBRARIES)
> sysdb_ssh_tests_SOURCES = \
>     src/tests/sysdb_ssh-tests.c
>@@ -1279,7 +1279,7 @@ TEST_MOCK_RESP_OBJ = \
>      src/responder/common/negcache.c \
>      src/responder/common/responder_common.c
> 
>-nss_srv_tests_DEPENDENCIES = \
>+EXTRA_nss_srv_tests_DEPENDENCIES = \
>      $(ldblib_LTLIBRARIES)
> nss_srv_tests_SOURCES = \
>      $(TEST_MOCK_RESP_OBJ) \
>@@ -1303,7 +1303,7 @@ nss_srv_tests_LDADD = \
>     libsss_test_common.la \
>     libsss_idmap.la
> 
>-test_find_uid_DEPENDENCIES = \
>+EXTRA_test_find_uid_DEPENDENCIES = \
>     $(ldblib_LTLIBRARIES)
"test_find_uid" does not test sysdb (memberof plugin). Those two lines can be
removed. It was probably copy&paste problem while test was created.

> test_find_uid_SOURCES = \
>     src/tests/cmocka/test_find_uid.c \
>@@ -1339,7 +1339,7 @@ sss_nss_idmap_tests_LDADD = \
>     $(CMOCKA_LIBS) \
>     libsss_nss_idmap.la
> 
>-dyndns_tests_DEPENDENCIES = \
>+EXTRA_dyndns_tests_DEPENDENCIES = \
>      $(ldblib_LTLIBRARIES)
> dyndns_tests_SOURCES = \
>      $(SSSD_RESOLV_OBJ) \
>-- 
>1.8.3.1
>

>_______________________________________________
>sssd-devel mailing list
>sssd-devel at lists.fedorahosted.org
>https://lists.fedorahosted.org/mailman/listinfo/sssd-devel




More information about the sssd-devel mailing list