Allow circular dependency of separate libtests.a

* gnulib-tool (func_emit_tests_Makefile_am): Add AM_LIBTOOLFLAGS
when use_libtests.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index a954c4cbdec2d6d3751575e618914c5908d71c36..1b1f43b5240781c06008681a6700a80b8a94c7ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-12  Eric Blake  <ebb9@byu.net>
+
+       Allow circular dependency of separate libtests.a
+       * gnulib-tool (func_emit_tests_Makefile_am): Add AM_LIBTOOLFLAGS
+       when use_libtests.
+
 2007-12-11  Eric Blake  <ebb9@byu.net>
 
        Fix bug with -0.0L in previous patch.

diff --git a/gnulib-tool b/gnulib-tool
index eef55a782f545f6e8cfa831e366a9e7d9ee6d5ec..1cdb902dd32c72f7cf6033cfd1a093a08dbe02a2 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1935,6 +1935,8 @@ func_emit_tests_Makefile_am ()
     echo "libtests_a_LIBADD = \$(${macro_prefix}tests_LIBOBJS)"
     echo "libtests_a_DEPENDENCIES = \$(${macro_prefix}tests_LIBOBJS)"
     echo "EXTRA_libtests_a_SOURCES ="
+    # The circular dependency in LDADD requires this.
+    echo "AM_LIBTOOLFLAGS = --preserve-dup-deps"
     echo
   fi
   cat allsnippets.tmp \