# HG changeset patch
# User Eric Blake <ebb9@byu.net>
# Date 1176764296 0
# Node ID ae4587be462bd452e9b6915a5e587cd13782ae2f
# Parent  92376abc52b56acdd2c6eeeb17e197f57be91ffc
Fix --with-tests compilation on cygwin.
* modules/argmatch-tests (Makefile.am): List gnulib library first
in LDADD.
* modules/argp-tests (Makefile.am): Likewise.
* modules/array-list-tests (Makefile.am): Likewise.
* modules/array-oset-tests (Makefile.am): Likewise.
* modules/avltree-list-tests (Makefile.am): Likewise.
* modules/avltree-oset-tests (Makefile.am): Likewise.
* modules/avltreehash-list-tests (Makefile.am): Likewise.
* modules/carray-list-tests (Makefile.am): Likewise.
* modules/dirname-tests (Makefile.am): Likewise.
* modules/frexp-tests (Makefile.am): Likewise.
* modules/isnanl-tests (Makefile.am): Likewise.
* modules/linked-list-tests (Makefile.am): Likewise.
* modules/linkedhash-list-tests (Makefile.am): Likewise.
* modules/lock-tests (Makefile.am): Likewise.
* modules/rbtree-list-tests (Makefile.am): Likewise.
* modules/rbtree-oset-tests (Makefile.am): Likewise.
* modules/rbtreehash-list-tests (Makefile.am): Likewise.
* modules/tls-tests (Makefile.am): Likewise.
* modules/tsearch-tests (Makefile.am): Likewise.
* modules/xvasprintf-tests (Makefile.am): Likewise.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2007-04-16  Eric Blake  <ebb9@byu.net>
 
+	Fix --with-tests compilation on cygwin.
+	* modules/argmatch-tests (Makefile.am): List gnulib library first
+	in LDADD.
+	* modules/argp-tests (Makefile.am): Likewise.
+	* modules/array-list-tests (Makefile.am): Likewise.
+	* modules/array-oset-tests (Makefile.am): Likewise.
+	* modules/avltree-list-tests (Makefile.am): Likewise.
+	* modules/avltree-oset-tests (Makefile.am): Likewise.
+	* modules/avltreehash-list-tests (Makefile.am): Likewise.
+	* modules/carray-list-tests (Makefile.am): Likewise.
+	* modules/dirname-tests (Makefile.am): Likewise.
+	* modules/frexp-tests (Makefile.am): Likewise.
+	* modules/isnanl-tests (Makefile.am): Likewise.
+	* modules/linked-list-tests (Makefile.am): Likewise.
+	* modules/linkedhash-list-tests (Makefile.am): Likewise.
+	* modules/lock-tests (Makefile.am): Likewise.
+	* modules/rbtree-list-tests (Makefile.am): Likewise.
+	* modules/rbtree-oset-tests (Makefile.am): Likewise.
+	* modules/rbtreehash-list-tests (Makefile.am): Likewise.
+	* modules/tls-tests (Makefile.am): Likewise.
+	* modules/tsearch-tests (Makefile.am): Likewise.
+	* modules/xvasprintf-tests (Makefile.am): Likewise.
+
 	Fix fpurge for cygwin.
 	* lib/fpurge.c (fpurge): Fix order of operation flub, and return a
 	value.
diff --git a/modules/argmatch-tests b/modules/argmatch-tests
--- a/modules/argmatch-tests
+++ b/modules/argmatch-tests
@@ -9,5 +9,5 @@
 Makefile.am:
 TESTS += test-argmatch
 check_PROGRAMS += test-argmatch
-test_argmatch_LDADD = @LIBINTL@ $(LDADD)
+test_argmatch_LDADD = $(LDADD) @LIBINTL@
 
diff --git a/modules/argp-tests b/modules/argp-tests
--- a/modules/argp-tests
+++ b/modules/argp-tests
@@ -7,6 +7,6 @@
 
 Makefile.am:
 TESTS += test-argp test-argp-2.sh
-check_PROGRAMS += test-argp 
-test_argp_LDADD = @LIBINTL@ $(LDADD)
+check_PROGRAMS += test-argp
+test_argp_LDADD = $(LDADD) @LIBINTL@
 EXTRA_DIST += test-argp-2.sh
diff --git a/modules/array-list-tests b/modules/array-list-tests
--- a/modules/array-list-tests
+++ b/modules/array-list-tests
@@ -9,5 +9,5 @@
 Makefile.am:
 TESTS += test-array_list
 check_PROGRAMS += test-array_list
-test_array_list_LDADD = @LIBINTL@ $(LDADD)
+test_array_list_LDADD = $(LDADD) @LIBINTL@
 
diff --git a/modules/array-oset-tests b/modules/array-oset-tests
--- a/modules/array-oset-tests
+++ b/modules/array-oset-tests
@@ -10,5 +10,5 @@
 Makefile.am:
 TESTS += test-array_oset
 check_PROGRAMS += test-array_oset
-test_array_oset_LDADD = @LIBINTL@ $(LDADD)
+test_array_oset_LDADD = $(LDADD) @LIBINTL@
 
diff --git a/modules/avltree-list-tests b/modules/avltree-list-tests
--- a/modules/avltree-list-tests
+++ b/modules/avltree-list-tests
@@ -10,5 +10,4 @@
 Makefile.am:
 TESTS += test-avltree_list
 check_PROGRAMS += test-avltree_list
-test_avltree_list_LDADD = @LIBINTL@ $(LDADD)
-
+test_avltree_list_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/avltree-oset-tests b/modules/avltree-oset-tests
--- a/modules/avltree-oset-tests
+++ b/modules/avltree-oset-tests
@@ -10,5 +10,4 @@
 Makefile.am:
 TESTS += test-avltree_oset
 check_PROGRAMS += test-avltree_oset
-test_avltree_oset_LDADD = @LIBINTL@ $(LDADD)
-
+test_avltree_oset_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/avltreehash-list-tests b/modules/avltreehash-list-tests
--- a/modules/avltreehash-list-tests
+++ b/modules/avltreehash-list-tests
@@ -10,5 +10,5 @@
 Makefile.am:
 TESTS += test-avltreehash_list
 check_PROGRAMS += test-avltreehash_list
-test_avltreehash_list_LDADD = @LIBINTL@ $(LDADD)
+test_avltreehash_list_LDADD = $(LDADD) @LIBINTL@
 
diff --git a/modules/carray-list-tests b/modules/carray-list-tests
--- a/modules/carray-list-tests
+++ b/modules/carray-list-tests
@@ -10,5 +10,5 @@
 Makefile.am:
 TESTS += test-carray_list
 check_PROGRAMS += test-carray_list
-test_carray_list_LDADD = @LIBINTL@ $(LDADD)
+test_carray_list_LDADD = $(LDADD) @LIBINTL@
 
diff --git a/modules/dirname-tests b/modules/dirname-tests
--- a/modules/dirname-tests
+++ b/modules/dirname-tests
@@ -9,4 +9,4 @@
 Makefile.am:
 TESTS += test-dirname
 noinst_PROGRAMS += test-dirname
-test_dirname_LDADD = @LIBINTL@ $(LDADD)
+test_dirname_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/frexp-tests b/modules/frexp-tests
--- a/modules/frexp-tests
+++ b/modules/frexp-tests
@@ -10,7 +10,7 @@
 Makefile.am:
 TESTS += test-frexp
 check_PROGRAMS += test-frexp
-test_frexp_LDADD = @FREXP_LIBM@ $(LDADD)
+test_frexp_LDADD = $(LDADD) @FREXP_LIBM@
 
 License:
 LGPL
diff --git a/modules/isnanl-tests b/modules/isnanl-tests
--- a/modules/isnanl-tests
+++ b/modules/isnanl-tests
@@ -10,6 +10,6 @@
 Makefile.am:
 TESTS += test-isnanl
 check_PROGRAMS += test-isnanl
-test_isnanl_LDADD = @ISNANL_LIBM@ $(LDADD)
+test_isnanl_LDADD = $(LDADD) @ISNANL_LIBM@
 EXTRA_DIST += test-isnanl.h
 
diff --git a/modules/linked-list-tests b/modules/linked-list-tests
--- a/modules/linked-list-tests
+++ b/modules/linked-list-tests
@@ -10,5 +10,4 @@
 Makefile.am:
 TESTS += test-linked_list
 check_PROGRAMS += test-linked_list
-test_linked_list_LDADD = @LIBINTL@ $(LDADD)
-
+test_linked_list_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/linkedhash-list-tests b/modules/linkedhash-list-tests
--- a/modules/linkedhash-list-tests
+++ b/modules/linkedhash-list-tests
@@ -10,5 +10,4 @@
 Makefile.am:
 TESTS += test-linkedhash_list
 check_PROGRAMS += test-linkedhash_list
-test_linkedhash_list_LDADD = @LIBINTL@ $(LDADD)
-
+test_linkedhash_list_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/lock-tests b/modules/lock-tests
--- a/modules/lock-tests
+++ b/modules/lock-tests
@@ -18,5 +18,4 @@
 Makefile.am:
 TESTS += test-lock
 check_PROGRAMS += test-lock
-test_lock_LDADD = @LIBMULTITHREAD@ @LIBSCHED@ $(LDADD)
-
+test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@
diff --git a/modules/rbtree-list-tests b/modules/rbtree-list-tests
--- a/modules/rbtree-list-tests
+++ b/modules/rbtree-list-tests
@@ -10,5 +10,4 @@
 Makefile.am:
 TESTS += test-rbtree_list
 check_PROGRAMS += test-rbtree_list
-test_rbtree_list_LDADD = @LIBINTL@ $(LDADD)
-
+test_rbtree_list_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/rbtree-oset-tests b/modules/rbtree-oset-tests
--- a/modules/rbtree-oset-tests
+++ b/modules/rbtree-oset-tests
@@ -10,5 +10,4 @@
 Makefile.am:
 TESTS += test-rbtree_oset
 check_PROGRAMS += test-rbtree_oset
-test_rbtree_oset_LDADD = @LIBINTL@ $(LDADD)
-
+test_rbtree_oset_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/rbtreehash-list-tests b/modules/rbtreehash-list-tests
--- a/modules/rbtreehash-list-tests
+++ b/modules/rbtreehash-list-tests
@@ -10,5 +10,4 @@
 Makefile.am:
 TESTS += test-rbtreehash_list
 check_PROGRAMS += test-rbtreehash_list
-test_rbtreehash_list_LDADD = @LIBINTL@ $(LDADD)
-
+test_rbtreehash_list_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/tls-tests b/modules/tls-tests
--- a/modules/tls-tests
+++ b/modules/tls-tests
@@ -18,5 +18,5 @@
 Makefile.am:
 TESTS += test-tls
 check_PROGRAMS += test-tls
-test_tls_LDADD = @LIBMULTITHREAD@ @LIBSCHED@ $(LDADD)
+test_tls_LDADD = $(LDADD) @LIBMULTITHREAD@ @LIBSCHED@
 
diff --git a/modules/tsearch-tests b/modules/tsearch-tests
--- a/modules/tsearch-tests
+++ b/modules/tsearch-tests
@@ -20,7 +20,7 @@
 TESTS += test-tsearch.sh
 TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-tsearch
-test_tsearch_LDADD = @TEST_TSEARCH_LIBM@ $(LDADD)
+test_tsearch_LDADD = $(LDADD) @TEST_TSEARCH_LIBM@
 EXTRA_DIST += test-tsearch.sh
 
 License:
diff --git a/modules/xvasprintf-tests b/modules/xvasprintf-tests
--- a/modules/xvasprintf-tests
+++ b/modules/xvasprintf-tests
@@ -9,5 +9,5 @@
 Makefile.am:
 TESTS += test-xvasprintf
 check_PROGRAMS += test-xvasprintf
-test_xvasprintf_LDADD = @LIBINTL@ $(LDADD)
+test_xvasprintf_LDADD = $(LDADD) @LIBINTL@