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.

12 files changed, 12 insertions, 12 deletions

diff --git a/modules/uniconv/u16-conv-from-enc-tests b/modules/uniconv/u16-conv-from-enc-tests
index c9bfcc5502..5539ccb25f 100644
--- 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 43afb03bcb..399537ac7d 100644
--- 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 e353d9a229..b9c162a925 100644
--- 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 64a2e20ce9..0548b0159e 100644
--- 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 b9c31f8671..e35a75a03b 100644
--- 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 0058c184b7..a46e9b5c19 100644
--- 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 984818c502..2370b5801a 100644
--- 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 f743c08b9f..19f5eca8f5 100644
--- 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 cc243626af..4dc02cb0bf 100644
--- 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 cc5be0820b..00aa37f0ca 100644
--- 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 da5f3b69fa..971786e1e4 100644
--- 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 b5606d4d21..b5724430e2 100644
--- 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@