diff options
130 files changed, 154 insertions, 142 deletions
@@ -1,5 +1,12 @@ 2023-01-07 Bruno Haible <bruno@clisp.org> + mbrtowc: Rename LIB_MBRTOWC to MBRTOWC_LIB. + * m4/mbrtowc.m4: Rename LIB_MBRTOWC to MBRTOWC_LIB. + All uses changed. + * NEWS: Mention the change. + +2023-01-07 Bruno Haible <bruno@clisp.org> + hard-locale: Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB. * modules/hard-locale (configure.ac): Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB. @@ -74,6 +74,8 @@ User visible incompatible changes Date Modules Changes +2023-01-07 mbrtowc Link with $(MBRTOWC_LIB) instead of $(LIB_MBRTOWC). + 2023-01-07 hard-locale Link with $(HARD_LOCALE_LIB) instead of $(LIB_HARD_LOCALE). diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index bb39304199..4bf91bec3b 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,4 +1,4 @@ -# mbrtowc.m4 serial 38 -*- coding: utf-8 -*- +# mbrtowc.m4 serial 39 -*- coding: utf-8 -*- dnl Copyright (C) 2001-2002, 2004-2005, 2008-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -91,20 +91,23 @@ AC_DEFUN([gl_FUNC_MBRTOWC], fi if test $REPLACE_MBSTATE_T = 1; then case "$host_os" in - mingw*) LIB_MBRTOWC= ;; + mingw*) MBRTOWC_LIB= ;; *) gl_WEAK_SYMBOLS case "$gl_cv_have_weak" in - *yes) LIB_MBRTOWC= ;; - *) LIB_MBRTOWC="$LIBPTHREAD" ;; + *yes) MBRTOWC_LIB= ;; + *) MBRTOWC_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_MBRTOWC= + MBRTOWC_LIB= fi - dnl LIB_MBRTOWC is expected to be '-pthread' or '-lpthread' on AIX + dnl MBRTOWC_LIB is expected to be '-pthread' or '-lpthread' on AIX dnl with gcc or xlc, and empty otherwise. + AC_SUBST([MBRTOWC_LIB]) + dnl For backward compatibility. + LIB_MBRTOWC="$MBRTOWC_LIB" AC_SUBST([LIB_MBRTOWC]) ]) diff --git a/modules/acl b/modules/acl index 1a3a14e6c2..8bcfd99420 100644 --- a/modules/acl +++ b/modules/acl @@ -21,7 +21,7 @@ Include: "acl.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/acl-tests b/modules/acl-tests index e4173fe9ae..44190b607d 100644 --- a/modules/acl-tests +++ b/modules/acl-tests @@ -25,6 +25,6 @@ TESTS += \ test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls -test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIB_MBRTOWC) -test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIB_MBRTOWC) -test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIB_MBRTOWC) +test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB) +test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB) +test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/argmatch b/modules/argmatch index bd534f5056..f07012644b 100644 --- a/modules/argmatch +++ b/modules/argmatch @@ -27,7 +27,7 @@ Include: "argmatch.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/argmatch-tests b/modules/argmatch-tests index 1ede023b8a..2f70d491d2 100644 --- 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 = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) +test_argmatch_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/backup-rename b/modules/backup-rename index 54a8270a90..6f6ab87a4b 100644 --- a/modules/backup-rename +++ b/modules/backup-rename @@ -36,7 +36,7 @@ Include: "backupfile.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/backupfile b/modules/backupfile index 804e62d48c..08bf1d2526 100644 --- a/modules/backupfile +++ b/modules/backupfile @@ -37,7 +37,7 @@ Include: "backupfile.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/c32isalnum-tests b/modules/c32isalnum-tests index 54ef82c0dc..a4fd812259 100644 --- a/modules/c32isalnum-tests +++ b/modules/c32isalnum-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isalnum -test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isalpha-tests b/modules/c32isalpha-tests index 1e4c77bfbc..d5864dac3c 100644 --- a/modules/c32isalpha-tests +++ b/modules/c32isalpha-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isalpha -test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isblank-tests b/modules/c32isblank-tests index 9efdda44c7..0e1a694548 100644 --- a/modules/c32isblank-tests +++ b/modules/c32isblank-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isblank -test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32iscntrl-tests b/modules/c32iscntrl-tests index d927f33f41..dcf26e0f89 100644 --- a/modules/c32iscntrl-tests +++ b/modules/c32iscntrl-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32iscntrl -test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isdigit-tests b/modules/c32isdigit-tests index b300e11ca8..db2e3d4752 100644 --- a/modules/c32isdigit-tests +++ b/modules/c32isdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isdigit -test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isgraph-tests b/modules/c32isgraph-tests index a1badde179..9efa4342c7 100644 --- a/modules/c32isgraph-tests +++ b/modules/c32isgraph-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isgraph -test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32islower-tests b/modules/c32islower-tests index 5a6010fdf5..b8d8fa4ab3 100644 --- a/modules/c32islower-tests +++ b/modules/c32islower-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32islower -test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isprint-tests b/modules/c32isprint-tests index 5c804f244d..17fb0b6fe5 100644 --- a/modules/c32isprint-tests +++ b/modules/c32isprint-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isprint -test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32ispunct-tests b/modules/c32ispunct-tests index 396d1ca4c0..8ab1c6fa52 100644 --- a/modules/c32ispunct-tests +++ b/modules/c32ispunct-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32ispunct -test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isspace-tests b/modules/c32isspace-tests index aef1272a75..a648014e3a 100644 --- a/modules/c32isspace-tests +++ b/modules/c32isspace-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isspace -test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isupper-tests b/modules/c32isupper-tests index beeb3a91ed..1d42997719 100644 --- a/modules/c32isupper-tests +++ b/modules/c32isupper-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isupper -test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isxdigit-tests b/modules/c32isxdigit-tests index b0860405e6..9731b9593c 100644 --- a/modules/c32isxdigit-tests +++ b/modules/c32isxdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isxdigit -test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING) +test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/closein b/modules/closein index f0c1287ba5..b5f3ce332f 100644 --- a/modules/closein +++ b/modules/closein @@ -21,7 +21,7 @@ Include: "closein.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/closein-tests b/modules/closein-tests index dc288f2ea0..d40156cb6d 100644 --- a/modules/closein-tests +++ b/modules/closein-tests @@ -12,4 +12,4 @@ configure.ac: Makefile.am: TESTS += test-closein.sh check_PROGRAMS += test-closein -test_closein_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) +test_closein_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/closeout b/modules/closeout index 32fd9236d0..05f17957d9 100644 --- a/modules/closeout +++ b/modules/closeout @@ -23,7 +23,7 @@ Include: "closeout.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/copy-file b/modules/copy-file index fa4a403af1..dac8bd6358 100644 --- a/modules/copy-file +++ b/modules/copy-file @@ -37,7 +37,7 @@ Include: Link: $(LIB_ACL) -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/copy-file-tests b/modules/copy-file-tests index e20191ad24..1c554696f9 100644 --- a/modules/copy-file-tests +++ b/modules/copy-file-tests @@ -18,4 +18,4 @@ Makefile.am: TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) check_PROGRAMS += test-copy-file -test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) @LIBINTL@ $(LIB_MBRTOWC) +test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/csharpcomp b/modules/csharpcomp index a880a12d4f..244a802965 100644 --- a/modules/csharpcomp +++ b/modules/csharpcomp @@ -28,7 +28,7 @@ Include: "csharpcomp.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) $(LIBTHREAD) License: diff --git a/modules/csharpexec b/modules/csharpexec index 853ec0b2c1..ee82df8dd9 100644 --- a/modules/csharpexec +++ b/modules/csharpexec @@ -28,7 +28,7 @@ Include: "csharpexec.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) $(LIBTHREAD) License: diff --git a/modules/dfa b/modules/dfa index 4b78ef4870..793352e4f5 100644 --- a/modules/dfa +++ b/modules/dfa @@ -38,7 +38,7 @@ Include: "localeinfo.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/dfa-tests b/modules/dfa-tests index 878e18d6d8..7d8f05a271 100644 --- a/modules/dfa-tests +++ b/modules/dfa-tests @@ -19,4 +19,4 @@ TESTS += \ test-dfa-match.sh check_PROGRAMS += test-dfa-match-aux -test_dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(LIB_MBRTOWC) +test_dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/exclude b/modules/exclude index bd785cada9..841dd826cd 100644 --- a/modules/exclude +++ b/modules/exclude @@ -28,7 +28,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/exclude-tests b/modules/exclude-tests index 762c18ce4b..1c3b0ab673 100644 --- a/modules/exclude-tests +++ b/modules/exclude-tests @@ -26,4 +26,4 @@ TESTS += \ test-exclude8.sh check_PROGRAMS += test-exclude -test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(LIB_MBRTOWC) $(LIBTHREAD) +test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBTHREAD) diff --git a/modules/fnmatch b/modules/fnmatch index 7de95c565a..8114ecf437 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -47,7 +47,7 @@ Include: <fnmatch.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/fnmatch-gnu b/modules/fnmatch-gnu index ed47df2caf..aba4aa71a9 100644 --- a/modules/fnmatch-gnu +++ b/modules/fnmatch-gnu @@ -21,7 +21,7 @@ Include: <fnmatch.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/fnmatch-h-c++-tests b/modules/fnmatch-h-c++-tests index abae06d998..eedd075d23 100644 --- a/modules/fnmatch-h-c++-tests +++ b/modules/fnmatch-h-c++-tests @@ -15,5 +15,5 @@ if ANSICXX TESTS += test-fnmatch-h-c++ check_PROGRAMS += test-fnmatch-h-c++ test_fnmatch_h_c___SOURCES = test-fnmatch-h-c++.cc -test_fnmatch_h_c___LDADD = $(LDADD) $(LIB_MBRTOWC) +test_fnmatch_h_c___LDADD = $(LDADD) $(MBRTOWC_LIB) endif diff --git a/modules/fnmatch-tests b/modules/fnmatch-tests index 5fd97c7e4d..b98e0c2e80 100644 --- a/modules/fnmatch-tests +++ b/modules/fnmatch-tests @@ -6,4 +6,4 @@ tests/macros.h Makefile.am: TESTS += test-fnmatch check_PROGRAMS += test-fnmatch -test_fnmatch_LDADD = $(LDADD) $(LIB_MBRTOWC) +test_fnmatch_LDADD = $(LDADD) $(MBRTOWC_LIB) diff --git a/modules/glob b/modules/glob index 4a89521e01..a03834a619 100644 --- a/modules/glob +++ b/modules/glob @@ -59,7 +59,7 @@ Include: <glob.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/glob-h-c++-tests b/modules/glob-h-c++-tests index ed8a008199..965f53f186 100644 --- a/modules/glob-h-c++-tests +++ b/modules/glob-h-c++-tests @@ -15,5 +15,5 @@ if ANSICXX TESTS += test-glob-h-c++ check_PROGRAMS += test-glob-h-c++ test_glob_h_c___SOURCES = test-glob-h-c++.cc -test_glob_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC) +test_glob_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(MBRTOWC_LIB) endif diff --git a/modules/glob-tests b/modules/glob-tests index 5054196a23..2abbba3da6 100644 --- a/modules/glob-tests +++ b/modules/glob-tests @@ -12,7 +12,7 @@ configure.ac: Makefile.am: TESTS += test-glob check_PROGRAMS += test-glob -test_glob_LDADD = $(LDADD) $(LIBINTL) $(LIB_MBRTOWC) +test_glob_LDADD = $(LDADD) $(LIBINTL) $(MBRTOWC_LIB) MOSTLYCLEANFILES += \ test-glob.tglobfile \ test-glob.tgloblink1 \ diff --git a/modules/human b/modules/human index 58b1b79ca3..a281fa4bf0 100644 --- a/modules/human +++ b/modules/human @@ -27,7 +27,7 @@ Include: "human.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/iswdigit-tests b/modules/iswdigit-tests index ca167ebc7c..e524b1bc6d 100644 --- a/modules/iswdigit-tests +++ b/modules/iswdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-iswdigit -test_iswdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_iswdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/iswxdigit-tests b/modules/iswxdigit-tests index 425c51c96c..2897e7da3f 100644 --- a/modules/iswxdigit-tests +++ b/modules/iswxdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-iswxdigit -test_iswxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_iswxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/javacomp b/modules/javacomp index bd0a1ebf09..cdd6473c4e 100644 --- a/modules/javacomp +++ b/modules/javacomp @@ -42,7 +42,7 @@ Include: "javacomp.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) $(GETRANDOM_LIB) $(LIBTHREAD) diff --git a/modules/javaexec b/modules/javaexec index 8322a4842b..4859e76254 100644 --- a/modules/javaexec +++ b/modules/javaexec @@ -29,7 +29,7 @@ Include: "javaexec.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) $(LIBTHREAD) License: diff --git a/modules/javaversion b/modules/javaversion index ebec3eafb4..e12fe0b2e9 100644 --- a/modules/javaversion +++ b/modules/javaversion @@ -26,7 +26,7 @@ Include: "javaversion.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) $(LIBTHREAD) License: diff --git a/modules/mbfile b/modules/mbfile index df169979a4..f7a0dc6338 100644 --- a/modules/mbfile +++ b/modules/mbfile @@ -26,7 +26,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbiter b/modules/mbiter index 4b36756c25..42305d62cd 100644 --- a/modules/mbiter +++ b/modules/mbiter @@ -26,7 +26,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbmemcasecmp b/modules/mbmemcasecmp index 79953d79b3..cb290adabb 100644 --- a/modules/mbmemcasecmp +++ b/modules/mbmemcasecmp @@ -18,7 +18,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests index fea2084612..bf522e8472 100644 --- a/modules/mbmemcasecmp-tests +++ b/modules/mbmemcasecmp-tests @@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbmemcasecmp -test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbmemcasecoll b/modules/mbmemcasecoll index db20df0ee7..7401d310c9 100644 --- a/modules/mbmemcasecoll +++ b/modules/mbmemcasecoll @@ -24,7 +24,7 @@ Include: "mbmemcasecoll.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests index 5201618048..0fe4d9c725 100644 --- a/modules/mbmemcasecoll-tests +++ b/modules/mbmemcasecoll-tests @@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbmemcasecoll -test_mbmemcasecoll_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbmemcasecoll_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbrlen b/modules/mbrlen index 420e8895d7..bdb81f4b64 100644 --- a/modules/mbrlen +++ b/modules/mbrlen @@ -29,7 +29,7 @@ Include: <wchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbrtoc32 b/modules/mbrtoc32 index 4757bcbe02..bc64ac5a33 100644 --- a/modules/mbrtoc32 +++ b/modules/mbrtoc32 @@ -49,7 +49,7 @@ Include: <uchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbrtoc32-tests b/modules/mbrtoc32-tests index d4c03f243f..9cb1f96ae8 100644 --- a/modules/mbrtoc32-tests +++ b/modules/mbrtoc32-tests @@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbrtoc32 test-mbrtoc32-w32 -test_mbrtoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbrtoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbrtowc b/modules/mbrtowc index e81da6f350..4fbffab1de 100644 --- a/modules/mbrtowc +++ b/modules/mbrtowc @@ -53,7 +53,7 @@ Include: <wchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests index 6331be01d0..3362aa0d91 100644 --- a/modules/mbrtowc-tests +++ b/modules/mbrtowc-tests @@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbrtowc test-mbrtowc-w32 -test_mbrtowc_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbrtowc_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbscasecmp b/modules/mbscasecmp index b02b28830b..b1f7c0d4a9 100644 --- a/modules/mbscasecmp +++ b/modules/mbscasecmp @@ -19,7 +19,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests index 7123e521e5..a777571945 100644 --- a/modules/mbscasecmp-tests +++ b/modules/mbscasecmp-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbscasecmp.sh TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbscasecmp -test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbscasestr b/modules/mbscasestr index b636b4802e..2892c2fc2b 100644 --- a/modules/mbscasestr +++ b/modules/mbscasestr @@ -24,7 +24,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests index 556c5903f3..09ebcaee77 100644 --- a/modules/mbscasestr-tests +++ b/modules/mbscasestr-tests @@ -24,7 +24,7 @@ Makefile.am: TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4 -test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC) -test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) -test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) -test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) +test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbschr b/modules/mbschr index 387a67b775..1a68a3c93d 100644 --- a/modules/mbschr +++ b/modules/mbschr @@ -19,7 +19,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbschr-tests b/modules/mbschr-tests index e7bccb0192..0d6b44f8ac 100644 --- a/modules/mbschr-tests +++ b/modules/mbschr-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbschr.sh TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbschr -test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbscspn b/modules/mbscspn index 288e39db49..4b2350c324 100644 --- a/modules/mbscspn +++ b/modules/mbscspn @@ -21,7 +21,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests index 64253e43fd..054fc61cbc 100644 --- a/modules/mbscspn-tests +++ b/modules/mbscspn-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbscspn.sh TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbscspn -test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbsinit b/modules/mbsinit index 1040068223..3146e7afba 100644 --- a/modules/mbsinit +++ b/modules/mbsinit @@ -30,7 +30,7 @@ Include: <wchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests index b41fff3330..040ce4e588 100644 --- a/modules/mbsinit-tests +++ b/modules/mbsinit-tests @@ -17,4 +17,4 @@ Makefile.am: TESTS += test-mbsinit.sh TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbsinit -test_mbsinit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsinit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbslen b/modules/mbslen index b4f4851e7f..a643fb8bcb 100644 --- a/modules/mbslen +++ b/modules/mbslen @@ -21,7 +21,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsncasecmp b/modules/mbsncasecmp index 10b887b8f9..25b8624f1b 100644 --- a/modules/mbsncasecmp +++ b/modules/mbsncasecmp @@ -19,7 +19,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests index 8b3aa79afa..c981e97c39 100644 --- a/modules/mbsncasecmp-tests +++ b/modules/mbsncasecmp-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbsncasecmp.sh TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbsncasecmp -test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbsnlen b/modules/mbsnlen index 3064b57974..2dc0222cfe 100644 --- a/modules/mbsnlen +++ b/modules/mbsnlen @@ -19,7 +19,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbsnrtoc32s b/modules/mbsnrtoc32s index 24a8458f3f..996e8a1d8f 100644 --- a/modules/mbsnrtoc32s +++ b/modules/mbsnrtoc32s @@ -27,7 +27,7 @@ Include: <uchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsnrtoc32s-tests b/modules/mbsnrtoc32s-tests index 886f7fe878..a06d51c3f7 100644 --- a/modules/mbsnrtoc32s-tests +++ b/modules/mbsnrtoc32s-tests @@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsnrtoc32s -test_mbsnrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsnrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs index 760448d02a..5b66cc2b8f 100644 --- a/modules/mbsnrtowcs +++ b/modules/mbsnrtowcs @@ -34,7 +34,7 @@ Include: <wchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests index ce5ae468bb..9dade91a2a 100644 --- a/modules/mbsnrtowcs-tests +++ b/modules/mbsnrtowcs-tests @@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsnrtowcs -test_mbsnrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsnrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbspbrk b/modules/mbspbrk index 9620e3f0f3..5570a07f1b 100644 --- a/modules/mbspbrk +++ b/modules/mbspbrk @@ -21,7 +21,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests index a0a66ca8dc..52f56d931e 100644 --- a/modules/mbspbrk-tests +++ b/modules/mbspbrk-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbspbrk.sh TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbspbrk -test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbspcasecmp b/modules/mbspcasecmp index da304ce71e..20b53c41a6 100644 --- a/modules/mbspcasecmp +++ b/modules/mbspcasecmp @@ -19,7 +19,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests index d1ee204d87..d64055eb9f 100644 --- a/modules/mbspcasecmp-tests +++ b/modules/mbspcasecmp-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbspcasecmp.sh TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbspcasecmp -test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbsrchr b/modules/mbsrchr index 9c42a5c163..9b660b8036 100644 --- a/modules/mbsrchr +++ b/modules/mbsrchr @@ -19,7 +19,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests index 13e29dfc21..cba16a3501 100644 --- a/modules/mbsrchr-tests +++ b/modules/mbsrchr-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbsrchr.sh TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsrchr -test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbsrtoc32s b/modules/mbsrtoc32s index f9d97d7548..0fec6bb042 100644 --- a/modules/mbsrtoc32s +++ b/modules/mbsrtoc32s @@ -26,7 +26,7 @@ Include: <uchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbsrtoc32s-tests b/modules/mbsrtoc32s-tests index dd1881e380..64eb047f4c 100644 --- a/modules/mbsrtoc32s-tests +++ b/modules/mbsrtoc32s-tests @@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsrtoc32s -test_mbsrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs index 15be6c2a60..4b5fa61cf4 100644 --- a/modules/mbsrtowcs +++ b/modules/mbsrtowcs @@ -37,7 +37,7 @@ Include: <wchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests index 8073a53a47..b8137484b5 100644 --- a/modules/mbsrtowcs-tests +++ b/modules/mbsrtowcs-tests @@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsrtowcs -test_mbsrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbssep b/modules/mbssep index 11c00bf1ca..0a93cf0c7e 100644 --- a/modules/mbssep +++ b/modules/mbssep @@ -21,7 +21,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsspn b/modules/mbsspn index b9144364f6..650c1f4de4 100644 --- a/modules/mbsspn +++ b/modules/mbsspn @@ -20,7 +20,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests index 9f7904cd4b..12434a3256 100644 --- a/modules/mbsspn-tests +++ b/modules/mbsspn-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-mbsspn.sh TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbsspn -test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbsstr b/modules/mbsstr index 8547e0971e..c417f6bc3f 100644 --- a/modules/mbsstr +++ b/modules/mbsstr @@ -24,7 +24,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests index 8be507d539..832c09c115 100644 --- a/modules/mbsstr-tests +++ b/modules/mbsstr-tests @@ -20,6 +20,6 @@ Makefile.am: TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3 -test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC) -test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) -test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) +test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbstoc32s b/modules/mbstoc32s index e2b166294c..c32a4df683 100644 --- a/modules/mbstoc32s +++ b/modules/mbstoc32s @@ -19,7 +19,7 @@ Include: <uchar.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv2+ diff --git a/modules/mbstoc32s-tests b/modules/mbstoc32s-tests index 7234daab7c..5ddb287328 100644 --- a/modules/mbstoc32s-tests +++ b/modules/mbstoc32s-tests @@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbstoc32s -test_mbstoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) +test_mbstoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) diff --git a/modules/mbstok_r b/modules/mbstok_r index dc0429e7cf..cc420ca196 100644 --- a/modules/mbstok_r +++ b/modules/mbstok_r @@ -22,7 +22,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mbswidth b/modules/mbswidth index 287584d60b..f3fe2ed21b 100644 --- a/modules/mbswidth +++ b/modules/mbswidth @@ -27,7 +27,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/mbuiter b/modules/mbuiter index 25d1d9fc78..b9e41031d5 100644 --- a/modules/mbuiter +++ b/modules/mbuiter @@ -27,7 +27,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPL diff --git a/modules/mkdir-p b/modules/mkdir-p index a9df81aed8..ca13e0b6ff 100644 --- a/modules/mkdir-p +++ b/modules/mkdir-p @@ -34,7 +34,7 @@ Include: "mkdir-p.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/propername b/modules/propername index fb1e78a9b2..2a63a0eaf0 100644 --- a/modules/propername +++ b/modules/propername @@ -31,7 +31,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/quote b/modules/quote index 35c30ce539..d9533a2de7 100644 --- a/modules/quote +++ b/modules/quote @@ -17,7 +17,7 @@ Include: "quote.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/quotearg b/modules/quotearg index 6f5356dcc6..db0903fa97 100644 --- a/modules/quotearg +++ b/modules/quotearg @@ -36,7 +36,7 @@ Include: "quotearg.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/quotearg-simple b/modules/quotearg-simple index 6a5c89296d..240192329a 100644 --- a/modules/quotearg-simple +++ b/modules/quotearg-simple @@ -13,7 +13,7 @@ Makefile.am: Include: Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/quotearg-simple-tests b/modules/quotearg-simple-tests index dbbd94e712..7f2f03f345 100644 --- a/modules/quotearg-simple-tests +++ b/modules/quotearg-simple-tests @@ -19,4 +19,4 @@ AC_CHECK_FUNCS_ONCE([mprotect]) Makefile.am: TESTS += test-quotearg-simple check_PROGRAMS += test-quotearg-simple -test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) +test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/quotearg-tests b/modules/quotearg-tests index dc94b34afa..176b317785 100644 --- a/modules/quotearg-tests +++ b/modules/quotearg-tests @@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ host_os='@host_os@' check_PROGRAMS += test-quotearg -test_quotearg_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(LIB_MBRTOWC) +test_quotearg_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/readtokens-tests b/modules/readtokens-tests index 9e4c0606b9..1637125569 100644 --- a/modules/readtokens-tests +++ b/modules/readtokens-tests @@ -11,4 +11,4 @@ configure.ac: Makefile.am: TESTS += test-readtokens.sh check_PROGRAMS += test-readtokens -test_readtokens_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) +test_readtokens_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/regex b/modules/regex index 7779a1e796..dfe0c2918e 100644 --- a/modules/regex +++ b/modules/regex @@ -58,7 +58,7 @@ Include: <regex.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) $(LIBTHREAD) $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise diff --git a/modules/regex-quote b/modules/regex-quote index 9ffa6aec60..43ddc49707 100644 --- a/modules/regex-quote +++ b/modules/regex-quote @@ -21,7 +21,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/regex-quote-tests b/modules/regex-quote-tests index 64e4460d1d..85739b57e9 100644 --- a/modules/regex-quote-tests +++ b/modules/regex-quote-tests @@ -11,4 +11,4 @@ configure.ac: Makefile.am: TESTS += test-regex-quote check_PROGRAMS += test-regex-quote -test_regex_quote_LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIB_MBRTOWC) $(LIBTHREAD) +test_regex_quote_LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(MBRTOWC_LIB) $(LIBTHREAD) diff --git a/modules/regex-tests b/modules/regex-tests index 4b14f4724c..6475707509 100644 --- a/modules/regex-tests +++ b/modules/regex-tests @@ -12,4 +12,4 @@ configure.ac: Makefile.am: TESTS += test-regex check_PROGRAMS += test-regex -test_regex_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) @LIBINTL@ $(LIBTHREAD) +test_regex_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) @LIBINTL@ $(LIBTHREAD) diff --git a/modules/rpmatch b/modules/rpmatch index 7f8d9910ab..c11296b985 100644 --- a/modules/rpmatch +++ b/modules/rpmatch @@ -30,7 +30,7 @@ Include: <stdlib.h> Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise License: diff --git a/modules/sh-quote b/modules/sh-quote index 97378f8bb5..c3e23dc878 100644 --- a/modules/sh-quote +++ b/modules/sh-quote @@ -19,7 +19,7 @@ Include: "sh-quote.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/sh-quote-tests b/modules/sh-quote-tests index 2ac9722945..1bded043f2 100644 --- a/modules/sh-quote-tests +++ b/modules/sh-quote-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-sh-quote check_PROGRAMS += test-sh-quote -test_sh_quote_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) +test_sh_quote_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/sys_stat-c++-tests b/modules/sys_stat-c++-tests index 2dba0c1ee5..f5b3f28c90 100644 --- a/modules/sys_stat-c++-tests +++ b/modules/sys_stat-c++-tests @@ -15,5 +15,5 @@ if ANSICXX TESTS += test-sys_stat-c++ check_PROGRAMS += test-sys_stat-c++ test_sys_stat_c___SOURCES = test-sys_stat-c++.cc -test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC) $(GETRANDOM_LIB) +test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(MBRTOWC_LIB) $(GETRANDOM_LIB) endif diff --git a/modules/system-quote b/modules/system-quote index b704684dfb..b1c860261b 100644 --- a/modules/system-quote +++ b/modules/system-quote @@ -20,7 +20,7 @@ Include: "system-quote.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/system-quote-tests b/modules/system-quote-tests index 22f08389f6..e5850614f5 100644 --- a/modules/system-quote-tests +++ b/modules/system-quote-tests @@ -18,7 +18,7 @@ configure.ac: Makefile.am: TESTS += test-system-quote.sh check_PROGRAMS += test-system-quote-main test-system-quote-child -test_system_quote_main_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) +test_system_quote_main_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB) # The test-system-quote-child program must be a real executable, not a libtool # wrapper script, and should link against as few libraries as possible. # Therefore don't link it against any libraries other than -lc. diff --git a/modules/trim b/modules/trim index 23df06cd74..a4483c2f65 100644 --- a/modules/trim +++ b/modules/trim @@ -22,7 +22,7 @@ Include: Link: $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/uchar-c++-tests b/modules/uchar-c++-tests index 7e63bb9fce..12183abd52 100644 --- a/modules/uchar-c++-tests +++ b/modules/uchar-c++-tests @@ -39,5 +39,5 @@ test_uchar_c___SOURCES = test-uchar-c++.cc if CXX_HAVE_CUCHAR test_uchar_c___SOURCES += test-uchar-c++2.cc endif -test_uchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC) +test_uchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) endif diff --git a/modules/unistdio/ulc-asnprintf b/modules/unistdio/ulc-asnprintf index 500609dcb7..457640fe0f 100644 --- a/modules/unistdio/ulc-asnprintf +++ b/modules/unistdio/ulc-asnprintf @@ -22,7 +22,7 @@ Include: "unistdio.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv3+ or GPLv2+ diff --git a/modules/unistdio/ulc-asnprintf-tests b/modules/unistdio/ulc-asnprintf-tests index 16699cde32..99a5851624 100644 --- a/modules/unistdio/ulc-asnprintf-tests +++ b/modules/unistdio/ulc-asnprintf-tests @@ -12,4 +12,4 @@ Makefile.am: TESTS += test-ulc-asnprintf1 check_PROGRAMS += test-ulc-asnprintf1 test_ulc_asnprintf1_SOURCES = unistdio/test-ulc-asnprintf1.c -test_ulc_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC) +test_ulc_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) diff --git a/modules/unistdio/ulc-fprintf b/modules/unistdio/ulc-fprintf index 1747f2603f..fe0d16af38 100644 --- a/modules/unistdio/ulc-fprintf +++ b/modules/unistdio/ulc-fprintf @@ -22,7 +22,7 @@ Include: "unistdio.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv3+ or GPLv2+ diff --git a/modules/unistdio/ulc-vasnprintf b/modules/unistdio/ulc-vasnprintf index 61107fe13a..7f7614d8ac 100644 --- a/modules/unistdio/ulc-vasnprintf +++ b/modules/unistdio/ulc-vasnprintf @@ -60,7 +60,7 @@ Include: "unistdio.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv3+ or GPLv2+ diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests index 55e55ce84d..6a5155dcf4 100644 --- a/modules/unistdio/ulc-vasnprintf-tests +++ b/modules/unistdio/ulc-vasnprintf-tests @@ -22,8 +22,8 @@ TESTS += test-ulc-vasnprintf1 unistdio/test-ulc-vasnprintf2.sh unistdio/test-ulc TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-ulc-vasnprintf1 test-ulc-vasnprintf2 test-ulc-vasnprintf3 test_ulc_vasnprintf1_SOURCES = unistdio/test-ulc-vasnprintf1.c -test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC) +test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) test_ulc_vasnprintf2_SOURCES = unistdio/test-ulc-vasnprintf2.c -test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC) +test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) test_ulc_vasnprintf3_SOURCES = unistdio/test-ulc-vasnprintf3.c -test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC) +test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) diff --git a/modules/unistdio/ulc-vasprintf b/modules/unistdio/ulc-vasprintf index 0a57c73d2b..f7b34748cb 100644 --- a/modules/unistdio/ulc-vasprintf +++ b/modules/unistdio/ulc-vasprintf @@ -22,7 +22,7 @@ Include: "unistdio.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv3+ or GPLv2+ diff --git a/modules/unistdio/ulc-vasprintf-tests b/modules/unistdio/ulc-vasprintf-tests index abbdfc54b0..ccec1aee8a 100644 --- a/modules/unistdio/ulc-vasprintf-tests +++ b/modules/unistdio/ulc-vasprintf-tests @@ -11,4 +11,4 @@ Makefile.am: TESTS += test-ulc-vasprintf1 check_PROGRAMS += test-ulc-vasprintf1 test_ulc_vasprintf1_SOURCES = unistdio/test-ulc-vasprintf1.c -test_ulc_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC) +test_ulc_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) diff --git a/modules/unistdio/ulc-vfprintf b/modules/unistdio/ulc-vfprintf index 83d0d241bd..bd3ce11d7c 100644 --- a/modules/unistdio/ulc-vfprintf +++ b/modules/unistdio/ulc-vfprintf @@ -22,7 +22,7 @@ Include: "unistdio.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv3+ or GPLv2+ diff --git a/modules/unistdio/ulc-vsnprintf b/modules/unistdio/ulc-vsnprintf index 5d93157844..ec4a449587 100644 --- a/modules/unistdio/ulc-vsnprintf +++ b/modules/unistdio/ulc-vsnprintf @@ -22,7 +22,7 @@ Include: "unistdio.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv3+ or GPLv2+ diff --git a/modules/unistdio/ulc-vsnprintf-tests b/modules/unistdio/ulc-vsnprintf-tests index 735a111cfd..c9acc634c9 100644 --- a/modules/unistdio/ulc-vsnprintf-tests +++ b/modules/unistdio/ulc-vsnprintf-tests @@ -12,4 +12,4 @@ Makefile.am: TESTS += test-ulc-vsnprintf1 check_PROGRAMS += test-ulc-vsnprintf1 test_ulc_vsnprintf1_SOURCES = unistdio/test-ulc-vsnprintf1.c -test_ulc_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(LIB_MBRTOWC) +test_ulc_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(MBRTOWC_LIB) diff --git a/modules/unistdio/ulc-vsprintf b/modules/unistdio/ulc-vsprintf index 0b5c424167..45896d7413 100644 --- a/modules/unistdio/ulc-vsprintf +++ b/modules/unistdio/ulc-vsprintf @@ -23,7 +23,7 @@ Include: "unistdio.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: LGPLv3+ or GPLv2+ diff --git a/modules/unistdio/ulc-vsprintf-tests b/modules/unistdio/ulc-vsprintf-tests index 98a6a6ce06..8d3f52e933 100644 --- a/modules/unistdio/ulc-vsprintf-tests +++ b/modules/unistdio/ulc-vsprintf-tests @@ -12,4 +12,4 @@ Makefile.am: TESTS += test-ulc-vsprintf1 check_PROGRAMS += test-ulc-vsprintf1 test_ulc_vsprintf1_SOURCES = unistdio/test-ulc-vsprintf1.c -test_ulc_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(LIB_MBRTOWC) +test_ulc_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(MBRTOWC_LIB) diff --git a/modules/xfreopen b/modules/xfreopen index b71efde111..a88d237b79 100644 --- a/modules/xfreopen +++ b/modules/xfreopen @@ -20,7 +20,7 @@ Include: "xfreopen.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/xmemcoll b/modules/xmemcoll index 3ef5491081..2ce12cc208 100644 --- a/modules/xmemcoll +++ b/modules/xmemcoll @@ -22,7 +22,7 @@ Include: "xmemcoll.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/yesno b/modules/yesno index 7a45e0f8bb..28e6ea17a6 100644 --- a/modules/yesno +++ b/modules/yesno @@ -22,7 +22,7 @@ Include: "yesno.h" Link: -$(LIB_MBRTOWC) +$(MBRTOWC_LIB) License: GPL diff --git a/modules/yesno-tests b/modules/yesno-tests index 45f429fe9c..f66e068e00 100644 --- a/modules/yesno-tests +++ b/modules/yesno-tests @@ -12,4 +12,4 @@ configure.ac: Makefile.am: TESTS += test-yesno.sh check_PROGRAMS += test-yesno -test_yesno_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) +test_yesno_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB) |