From: Eric Blake <ebb9@byu.net>
Date: Mon, 10 Dec 2007 16:54:54 +0000 (-0700)
Subject: Avoid link failures with separate libtests.a.
X-Git-Tag: v0.1~7931
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=41cb56c49a82c2363b7290e17ade4eb6a42360a4;p=gnulib.git

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 <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index d7af7f981..ed8799bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2007-12-11  Eric Blake  <ebb9@byu.net>
+
+	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  <ebb9@byu.net>
 	and Bruno Haible  <bruno@clisp.org>
 
 	Fix OpenBSD 4.0 <float.h> handling of long double.
diff --git a/gnulib-tool b/gnulib-tool
index 39ac9775d..eef55a782 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 ="