From 0ebfad1c550889136b94eb12e7795c90e8cc5394 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 23 Oct 2007 06:37:17 +0200 Subject: [PATCH] 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. --- ChangeLog | 28 ++++++++++++++++++++++ modules/uniconv/u16-conv-from-enc-tests | 2 +- modules/uniconv/u16-conv-to-enc-tests | 2 +- modules/uniconv/u16-strconv-from-enc-tests | 2 +- modules/uniconv/u16-strconv-to-enc-tests | 2 +- modules/uniconv/u32-conv-from-enc-tests | 2 +- modules/uniconv/u32-conv-to-enc-tests | 2 +- modules/uniconv/u32-strconv-from-enc-tests | 2 +- modules/uniconv/u32-strconv-to-enc-tests | 2 +- modules/uniconv/u8-conv-from-enc-tests | 2 +- modules/uniconv/u8-conv-to-enc-tests | 2 +- modules/uniconv/u8-strconv-from-enc-tests | 2 +- modules/uniconv/u8-strconv-to-enc-tests | 2 +- 13 files changed, 40 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index c43b7c0731..e8713f549e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2007-10-23 Ralf Wildenhues + + 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 * 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 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@ -- 2.30.2