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 e5fdd00eb480b6e2a668ca40352a5059e08beabe..70198231d632661331595ed7bcec0f98411272b4 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 daec26919a2db17f77aa09e3563156ae4d1e884f..253d4d6b117d071ab97d09300fe257b6d00bd7f7 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 817d7b7b660848a55aff3814dc546033c148ea1d..25a23efe16e284542a28cc95f655b8b37ceedb62 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 a15498bd98e1da2c5185398a80da44b7ee025fd1..6109216499bc1786cae852ea7958ae105b2cba70 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 553602dafa5dab923e1e0f1ad7566172c10257f3..3fd51ccd8581e3b086c95e4f4c26f11426db6307 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 70e9cf0a829bd5c4389bdbf6ae485cc1d63ff15c..c8c60f4f5a7e3d0b3852dc2f74ef79d0abb56d70 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 b0fb19724e3850e2855ca439813e2213beec431b..bda7f98edbcc9a1de9577de79a6d3a3bccdadaf7 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 2c85dcf51fa271fddce16bdbb81c0470461f4f76..54245a8138d21936662bbdf628b8a401c2cd8af8 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 b6a48d4a4ada7fe2d8bb474fad3d164db33dc74b..082862cb5ea96bb83e80241fc2b3e88dca14a469 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 93856d4942f1a7a554f43cf019fb9de6bb84b0f6..7cc0ec749585ebf16e1033b5d7b17f5f2e88a5f0 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 efc3018dcba564bbc5d8ccf521ad80c2dee7a5a5..adfe218eaa0eb63ccf9b273ed146f0cafd0b9dc3 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 33a0e598d7dd5287c4435a79dce8f046b7f8df29..5d77810dc683bf1ca1eaf4336d7b5694847afc34 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 2c1fee0776cded3e7f751c2c8b4d24ddd4ede33f..3b37c2b06bfe63786c25c978139dd9f5ad217038 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 fb973bc56220ffc6cccc8e1fe6477c3459bef05a..baf80e5630ad175c70ba7ec8b592ae91d5fa9633 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 e4ec5cbd10682f23381904930045030062496671..7c72c94734db4958f73b6d01b017f31b20a7b4df 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 a11f1b7c01301b4e90b1acc14ae51b477426ccc1..3d909e274ea9df5dd073ac9fa798571d48389e89 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 f0c090d74a1a12a577c8d2d08205a3a3ad641633..17e6a83089044edc6da2b573036fc13fb9971718 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 d875236e2c8cede892dcd617b7050a490eaf56eb..c7b8704301561506ea1e08e736c0d8af9427a840 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 9910af59c2da1723dcba8b10418fe3df46a1b403..b9f5a2313153ad84a2294800cb1fb69c8e80a63c 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 d258c0e3571a72e849602d7a4fe44788229a2625..5b0fa3dc8b1fc9d1b370cb74969191b92a7839cb 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 63c798a7a7f60f5f819157ab3d6abdaae90deac6..a920e6cb10bf1c3fae464aecc42cb620f9899ee8 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@