Fix linking of some uniconv tests on FreeBSD.

* modules/uniconv/u16-conv-from-enc-tests
(test_u16_conv_from_enc_LDADD): Link $(LDADD) before @LIBICONV@.
* modules/uniconv/u16-conv-to-enc-tests
(test_u16_conv_to_enc_LDADD): Likewise.
* modules/uniconv/u16-strconv-from-enc-tests
(test_u16_strconv_from_enc_LDADD): Likewise.
* modules/uniconv/u16-strconv-to-enc-tests
(test_u16_strconv_to_enc_LDADD): Likewise.
* modules/uniconv/u32-conv-from-enc-tests
(test_u32_conv_from_enc_LDADD): Likewise.
* modules/uniconv/u32-conv-to-enc-tests
(test_u32_conv_to_enc_LDADD): Likewise.
* modules/uniconv/u32-strconv-from-enc-tests
(test_u32_strconv_from_enc_LDADD): Likewise.
* modules/uniconv/u32-strconv-to-enc-tests
(test_u32_strconv_to_enc_LDADD): Likewise.
* modules/uniconv/u8-conv-from-enc-tests
(test_u8_conv_from_enc_LDADD): Likewise.
* modules/uniconv/u8-conv-to-enc-tests
(test_u8_conv_to_enc_LDADD): Likewise.
* modules/uniconv/u8-strconv-from-enc-tests
(test_u8_strconv_from_enc_LDADD): Likewise.
* modules/uniconv/u8-strconv-to-enc-tests
(test_u8_strconv_to_enc_LDADD): Likewise.

diff --git a/ChangeLog b/ChangeLog
index c43b7c0731da05d7177cf40201f5f92702848cce..e8713f549eb2b801fc2e511cce90631d6bc3f35b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2007-10-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix linking of some uniconv tests on FreeBSD.
+       * modules/uniconv/u16-conv-from-enc-tests
+       (test_u16_conv_from_enc_LDADD): Link $(LDADD) before @LIBICONV@.
+       * modules/uniconv/u16-conv-to-enc-tests
+       (test_u16_conv_to_enc_LDADD): Likewise.
+       * modules/uniconv/u16-strconv-from-enc-tests
+       (test_u16_strconv_from_enc_LDADD): Likewise.
+       * modules/uniconv/u16-strconv-to-enc-tests
+       (test_u16_strconv_to_enc_LDADD): Likewise.
+       * modules/uniconv/u32-conv-from-enc-tests
+       (test_u32_conv_from_enc_LDADD): Likewise.
+       * modules/uniconv/u32-conv-to-enc-tests
+       (test_u32_conv_to_enc_LDADD): Likewise.
+       * modules/uniconv/u32-strconv-from-enc-tests
+       (test_u32_strconv_from_enc_LDADD): Likewise.
+       * modules/uniconv/u32-strconv-to-enc-tests
+       (test_u32_strconv_to_enc_LDADD): Likewise.
+       * modules/uniconv/u8-conv-from-enc-tests
+       (test_u8_conv_from_enc_LDADD): Likewise.
+       * modules/uniconv/u8-conv-to-enc-tests
+       (test_u8_conv_to_enc_LDADD): Likewise.
+       * modules/uniconv/u8-strconv-from-enc-tests
+       (test_u8_strconv_from_enc_LDADD): Likewise.
+       * modules/uniconv/u8-strconv-to-enc-tests
+       (test_u8_strconv_to_enc_LDADD): Likewise.
+
 2007-10-22  Bruno Haible  <bruno@clisp.org>
 
        * lib/stdint.in.h: Add check that intmax_t and uintmax_t have the same

diff --git a/modules/uniconv/u16-conv-from-enc-tests b/modules/uniconv/u16-conv-from-enc-tests
index c9bfcc5502e1f774bbdf9c282f54ac0ec6d0eff4..5539ccb25fe5a2ec6761d0d791ed274014311895 100644 (file)
--- a/modules/uniconv/u16-conv-from-enc-tests
+++ b/modules/uniconv/u16-conv-from-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u16-conv-from-enc
 check_PROGRAMS += test-u16-conv-from-enc
 test_u16_conv_from_enc_SOURCES = uniconv/test-u16-conv-from-enc.c
-test_u16_conv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u16-conv-to-enc-tests b/modules/uniconv/u16-conv-to-enc-tests
index 43afb03bcbd2b8b2a0f31de22f432d2665a177c0..399537ac7d304684a02bf8e3bf95d27fb29e2620 100644 (file)
--- a/modules/uniconv/u16-conv-to-enc-tests
+++ b/modules/uniconv/u16-conv-to-enc-tests
@@ -9,5 +9,5 @@ Makefile.am:
 TESTS += test-u16-conv-to-enc
 check_PROGRAMS += test-u16-conv-to-enc
 test_u16_conv_to_enc_SOURCES = uniconv/test-u16-conv-to-enc.c
-test_u16_conv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u16-strconv-from-enc-tests b/modules/uniconv/u16-strconv-from-enc-tests
index e353d9a229f55ffc0e2847cf75072e6f379bf33a..b9c162a925afa83325832fd09ac839618ff4d864 100644 (file)
--- a/modules/uniconv/u16-strconv-from-enc-tests
+++ b/modules/uniconv/u16-strconv-from-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u16-strconv-from-enc
 check_PROGRAMS += test-u16-strconv-from-enc
 test_u16_strconv_from_enc_SOURCES = uniconv/test-u16-strconv-from-enc.c
-test_u16_strconv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u16-strconv-to-enc-tests b/modules/uniconv/u16-strconv-to-enc-tests
index 64a2e20ce93335649f22c581094bbfb447e50a27..0548b0159eebfb1813300742207c0d45f3971049 100644 (file)
--- a/modules/uniconv/u16-strconv-to-enc-tests
+++ b/modules/uniconv/u16-strconv-to-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u16-strconv-to-enc
 check_PROGRAMS += test-u16-strconv-to-enc
 test_u16_strconv_to_enc_SOURCES = uniconv/test-u16-strconv-to-enc.c
-test_u16_strconv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u16_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u32-conv-from-enc-tests b/modules/uniconv/u32-conv-from-enc-tests
index b9c31f8671c4fd21dd0e12c908249dcf7774a84a..e35a75a03b80e240498733b6dcbab25d93acaa3a 100644 (file)
--- a/modules/uniconv/u32-conv-from-enc-tests
+++ b/modules/uniconv/u32-conv-from-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u32-conv-from-enc
 check_PROGRAMS += test-u32-conv-from-enc
 test_u32_conv_from_enc_SOURCES = uniconv/test-u32-conv-from-enc.c
-test_u32_conv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u32-conv-to-enc-tests b/modules/uniconv/u32-conv-to-enc-tests
index 0058c184b7fb0be60bca0a9951817a02aba9d55f..a46e9b5c19cf45f55abc3549b8e43cae4f42937c 100644 (file)
--- a/modules/uniconv/u32-conv-to-enc-tests
+++ b/modules/uniconv/u32-conv-to-enc-tests
@@ -9,5 +9,5 @@ Makefile.am:
 TESTS += test-u32-conv-to-enc
 check_PROGRAMS += test-u32-conv-to-enc
 test_u32_conv_to_enc_SOURCES = uniconv/test-u32-conv-to-enc.c
-test_u32_conv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u32-strconv-from-enc-tests b/modules/uniconv/u32-strconv-from-enc-tests
index 984818c502ab76f19bf52b499615004b4bd13e5f..2370b5801a405ec746d7373337d4d1eacada985b 100644 (file)
--- a/modules/uniconv/u32-strconv-from-enc-tests
+++ b/modules/uniconv/u32-strconv-from-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u32-strconv-from-enc
 check_PROGRAMS += test-u32-strconv-from-enc
 test_u32_strconv_from_enc_SOURCES = uniconv/test-u32-strconv-from-enc.c
-test_u32_strconv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u32-strconv-to-enc-tests b/modules/uniconv/u32-strconv-to-enc-tests
index f743c08b9fb636cb8de9c1b0f25508bed00cd9db..19f5eca8f5ff7bef14f35a18af1b0996bcec2212 100644 (file)
--- a/modules/uniconv/u32-strconv-to-enc-tests
+++ b/modules/uniconv/u32-strconv-to-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u32-strconv-to-enc
 check_PROGRAMS += test-u32-strconv-to-enc
 test_u32_strconv_to_enc_SOURCES = uniconv/test-u32-strconv-to-enc.c
-test_u32_strconv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u32_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u8-conv-from-enc-tests b/modules/uniconv/u8-conv-from-enc-tests
index cc243626af32f37d6e36277bc436f4a96198fd35..4dc02cb0bf1e6be8766c828ec58084a53a5d6fda 100644 (file)
--- a/modules/uniconv/u8-conv-from-enc-tests
+++ b/modules/uniconv/u8-conv-from-enc-tests
@@ -11,5 +11,5 @@ Makefile.am:
 TESTS += test-u8-conv-from-enc
 check_PROGRAMS += test-u8-conv-from-enc
 test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c
-test_u8_conv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u8-conv-to-enc-tests b/modules/uniconv/u8-conv-to-enc-tests
index cc5be0820b345a397c98224d6f2c92e398b5121c..00aa37f0ca4210f69e6c2bba15d3c29eae94cf47 100644 (file)
--- a/modules/uniconv/u8-conv-to-enc-tests
+++ b/modules/uniconv/u8-conv-to-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u8-conv-to-enc
 check_PROGRAMS += test-u8-conv-to-enc
 test_u8_conv_to_enc_SOURCES = uniconv/test-u8-conv-to-enc.c
-test_u8_conv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u8-strconv-from-enc-tests b/modules/uniconv/u8-strconv-from-enc-tests
index da5f3b69fa704053dc7c180e304b176fdeaa0c50..971786e1e49551f2f7d7a887a989a8be8236e820 100644 (file)
--- a/modules/uniconv/u8-strconv-from-enc-tests
+++ b/modules/uniconv/u8-strconv-from-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u8-strconv-from-enc
 check_PROGRAMS += test-u8-strconv-from-enc
 test_u8_strconv_from_enc_SOURCES = uniconv/test-u8-strconv-from-enc.c
-test_u8_strconv_from_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
 

diff --git a/modules/uniconv/u8-strconv-to-enc-tests b/modules/uniconv/u8-strconv-to-enc-tests
index b5606d4d21ebdb87bf5876f66df1e1291766b10a..b5724430e25efed80875323464509e60dca28aa7 100644 (file)
--- a/modules/uniconv/u8-strconv-to-enc-tests
+++ b/modules/uniconv/u8-strconv-to-enc-tests
@@ -10,5 +10,5 @@ Makefile.am:
 TESTS += test-u8-strconv-to-enc
 check_PROGRAMS += test-u8-strconv-to-enc
 test_u8_strconv_to_enc_SOURCES = uniconv/test-u8-strconv-to-enc.c
-test_u8_strconv_to_enc_LDADD = @LIBICONV@ $(LDADD)
+test_u8_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@