From: Eric Blake <ebb9@byu.net>
Date: Wed, 12 Dec 2007 17:29:17 +0000 (-0700)
Subject: Allow circular dependency of separate libtests.a
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87022b58b03f40c8da5a86c3cde88dc43d0426c2;p=pspp

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 a954c4cbde..1b1f43b524 100644
--- 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 eef55a782f..1cdb902dd3 100755
--- 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 \