From 41cb56c49a82c2363b7290e17ade4eb6a42360a4 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 10 Dec 2007 09:54:54 -0700 Subject: [PATCH] Avoid link failures with separate libtests.a. * gnulib-tool (func_emit_tests_Makefile_am): Also list local_ldadd last, to satisfy circular dependencies. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ gnulib-tool | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7af7f981b..ed8799bbfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Eric Blake + + Avoid link failures with separate libtests.a. + * gnulib-tool (func_emit_tests_Makefile_am): Also list local_ldadd + last, to satisfy circular dependencies. + 2007-12-11 Eric Blake and Bruno Haible diff --git a/gnulib-tool b/gnulib-tool index 39ac9775d4..eef55a782f 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1923,7 +1923,10 @@ func_emit_tests_Makefile_am () if $use_libtests; then local_ldadd=' libtests.a $(LIBTESTS_LIBDEPS)' fi - echo "LDADD =${local_ldadd} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}" + # local_ldadd must be listed first, since it often depends on non-test + # modules; it must also be listed last, since it can include modules + # such as progname that satisfy dependencies of non-test modules. + echo "LDADD =${local_ldadd} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}${local_ldadd}" echo if $use_libtests; then echo "libtests_a_SOURCES =" -- 2.30.2