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
index e5fdd00..7019823 100644 (file)
--- 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
index daec269..253d4d6 100644 (file)
--- a/modules/argmatch-tests
+++ b/modules/argmatch-tests
@@ -9,5 +9,5 @@ configure.ac:
 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
index 817d7b7..25a23ef 100644 (file)
--- a/modules/argp-tests
+++ b/modules/argp-tests
@@ -7,6 +7,6 @@ progname
 
 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
index a15498b..6109216 100644 (file)
--- a/modules/array-list-tests
+++ b/modules/array-list-tests
@@ -9,5 +9,5 @@ configure.ac:
 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
index 553602d..3fd51cc 100644 (file)
--- a/modules/array-oset-tests
+++ b/modules/array-oset-tests
@@ -10,5 +10,5 @@ configure.ac:
 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
index 70e9cf0..c8c60f4 100644 (file)
--- a/modules/avltree-list-tests
+++ b/modules/avltree-list-tests
@@ -10,5 +10,4 @@ configure.ac:
 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
index b0fb197..bda7f98 100644 (file)
--- a/modules/avltree-oset-tests
+++ b/modules/avltree-oset-tests
@@ -10,5 +10,4 @@ configure.ac:
 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
index 2c85dcf..54245a8 100644 (file)
--- a/modules/avltreehash-list-tests
+++ b/modules/avltreehash-list-tests
@@ -10,5 +10,5 @@ configure.ac:
 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
index b6a48d4..082862c 100644 (file)
--- a/modules/carray-list-tests
+++ b/modules/carray-list-tests
@@ -10,5 +10,5 @@ configure.ac:
 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
index 93856d4..7cc0ec7 100644 (file)
--- a/modules/dirname-tests
+++ b/modules/dirname-tests
@@ -9,4 +9,4 @@ configure.ac:
 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
index efc3018..adfe218 100644 (file)
--- a/modules/frexp-tests
+++ b/modules/frexp-tests
@@ -10,7 +10,7 @@ configure.ac:
 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
index 33a0e59..5d77810 100644 (file)
--- a/modules/isnanl-tests
+++ b/modules/isnanl-tests
@@ -10,6 +10,6 @@ gl_LONG_DOUBLE_EXPONENT_LOCATION
 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
index 2c1fee0..3b37c2b 100644 (file)
--- a/modules/linked-list-tests
+++ b/modules/linked-list-tests
@@ -10,5 +10,4 @@ configure.ac:
 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
index fb973bc..baf80e5 100644 (file)
--- a/modules/linkedhash-list-tests
+++ b/modules/linkedhash-list-tests
@@ -10,5 +10,4 @@ configure.ac:
 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
index e4ec5cb..7c72c94 100644 (file)
--- a/modules/lock-tests
+++ b/modules/lock-tests
@@ -18,5 +18,4 @@ AC_SUBST([LIBSCHED])
 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
index a11f1b7..3d909e2 100644 (file)
--- a/modules/rbtree-list-tests
+++ b/modules/rbtree-list-tests
@@ -10,5 +10,4 @@ configure.ac:
 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
index f0c090d..17e6a83 100644 (file)
--- a/modules/rbtree-oset-tests
+++ b/modules/rbtree-oset-tests
@@ -10,5 +10,4 @@ configure.ac:
 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
index d875236..c7b8704 100644 (file)
--- a/modules/rbtreehash-list-tests
+++ b/modules/rbtreehash-list-tests
@@ -10,5 +10,4 @@ configure.ac:
 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
index 9910af5..b9f5a23 100644 (file)
--- a/modules/tls-tests
+++ b/modules/tls-tests
@@ -18,5 +18,5 @@ AC_SUBST([LIBSCHED])
 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
index d258c0e..5b0fa3d 100644 (file)
--- a/modules/tsearch-tests
+++ b/modules/tsearch-tests
@@ -20,7 +20,7 @@ Makefile.am:
 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
index 63c798a..a920e6c 100644 (file)
--- a/modules/xvasprintf-tests
+++ b/modules/xvasprintf-tests
@@ -9,5 +9,5 @@ configure.ac:
 Makefile.am:
 TESTS += test-xvasprintf
 check_PROGRAMS += test-xvasprintf
-test_xvasprintf_LDADD = @LIBINTL@ $(LDADD)
+test_xvasprintf_LDADD = $(LDADD) @LIBINTL@