>From daa573bc67c72b83d36c5e6ba57849e8ce96fe53 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 Jan 2023 11:39:17 +0100 Subject: [PATCH 07/18] getrandom: Rename LIB_GETRANDOM to GETRANDOM_LIB. * m4/getrandom.m4: Rename LIB_GETRANDOM to GETRANDOM_LIB. All uses changed. * NEWS: Mention the change. --- ChangeLog | 7 +++++++ NEWS | 3 +++ m4/getrandom.m4 | 11 +++++++---- modules/argv-iter-tests | 2 +- modules/clean-temp | 2 +- modules/crypto/gc-arcfour-tests | 2 +- modules/crypto/gc-arctwo-tests | 2 +- modules/crypto/gc-des-tests | 2 +- modules/crypto/gc-hmac-md5-tests | 2 +- modules/crypto/gc-hmac-sha1-tests | 2 +- modules/crypto/gc-hmac-sha256-tests | 2 +- modules/crypto/gc-hmac-sha512-tests | 2 +- modules/crypto/gc-md2-tests | 2 +- modules/crypto/gc-md4-tests | 2 +- modules/crypto/gc-md5-tests | 2 +- modules/crypto/gc-pbkdf2-sha1-tests | 2 +- modules/crypto/gc-pbkdf2-tests | 2 +- modules/crypto/gc-random | 2 +- modules/crypto/gc-rijndael-tests | 2 +- modules/crypto/gc-sha1-tests | 2 +- modules/crypto/gc-sha256-tests | 2 +- modules/crypto/gc-sha512-tests | 2 +- modules/crypto/gc-sm3-tests | 2 +- modules/crypto/gc-tests | 2 +- modules/getentropy | 2 +- modules/getentropy-tests | 2 +- modules/getrandom | 2 +- modules/getrandom-tests | 2 +- modules/getumask | 2 +- modules/getumask-tests | 2 +- modules/javacomp | 2 +- modules/mkdtemp | 2 +- modules/mkostemp | 2 +- modules/mkostemps | 2 +- modules/mkstemp | 2 +- modules/mkstemps | 2 +- modules/stdio-c++-tests | 2 +- modules/stdlib-c++-tests | 2 +- modules/stdlib-safer | 2 +- modules/supersede | 2 +- modules/supersede-tests | 2 +- modules/sys_random-c++-tests | 2 +- modules/sys_stat-c++-tests | 2 +- modules/tempname | 2 +- modules/tempname-tests | 2 +- modules/tmpfile | 2 +- modules/tmpfile-safer | 2 +- modules/unistd-c++-tests | 2 +- 48 files changed, 62 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9497f9ce93..2d968f4f75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-01-07 Bruno Haible + + getrandom: Rename LIB_GETRANDOM to GETRANDOM_LIB. + * m4/getrandom.m4: Rename LIB_GETRANDOM to GETRANDOM_LIB. + All uses changed. + * NEWS: Mention the change. + 2023-01-07 Bruno Haible getlogin, getlogin_r: Rename LIB_GETLOGIN to GETLOGIN_LIB. diff --git a/NEWS b/NEWS index 0b6da8e542..5ff7d0816f 100644 --- a/NEWS +++ b/NEWS @@ -74,6 +74,9 @@ User visible incompatible changes Date Modules Changes +2023-01-07 getrandom Link with $(GETRANDOM_LIB) instead of + $(LIB_GETRANDOM). + 2023-01-07 getlogin Link with $(GETLOGIN_LIB) instead of getlogin_r $(LIB_GETLOGIN). diff --git a/m4/getrandom.m4 b/m4/getrandom.m4 index f2010c0213..c508f1a55c 100644 --- a/m4/getrandom.m4 +++ b/m4/getrandom.m4 @@ -1,4 +1,4 @@ -# getrandom.m4 serial 9 +# getrandom.m4 serial 10 dnl Copyright 2020-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -62,13 +62,16 @@ AC_DEFUN([gl_FUNC_GETRANDOM], if test $gl_cv_lib_assume_bcrypt = yes; then AC_DEFINE([HAVE_LIB_BCRYPT], [1], [Define to 1 if the bcrypt library is guaranteed to be present.]) - LIB_GETRANDOM='-lbcrypt' + GETRANDOM_LIB='-lbcrypt' else - LIB_GETRANDOM='-ladvapi32' + GETRANDOM_LIB='-ladvapi32' fi ;; *) - LIB_GETRANDOM= ;; + GETRANDOM_LIB= ;; esac + AC_SUBST([GETRANDOM_LIB]) + dnl For backward compatibility. + LIB_GETRANDOM="$GETRANDOM_LIB" AC_SUBST([LIB_GETRANDOM]) ]) diff --git a/modules/argv-iter-tests b/modules/argv-iter-tests index 97cbe50e9f..fedbf83031 100644 --- a/modules/argv-iter-tests +++ b/modules/argv-iter-tests @@ -10,4 +10,4 @@ configure.ac: Makefile.am: TESTS += test-argv-iter check_PROGRAMS += test-argv-iter -test_argv_iter_LDADD = $(LDADD) $(LIB_GETRANDOM) +test_argv_iter_LDADD = $(LDADD) $(GETRANDOM_LIB) diff --git a/modules/clean-temp b/modules/clean-temp index a83f249903..5cf087dcb0 100644 --- a/modules/clean-temp +++ b/modules/clean-temp @@ -38,7 +38,7 @@ Include: "clean-temp.h" Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(LIBTHREAD) License: diff --git a/modules/crypto/gc-arcfour-tests b/modules/crypto/gc-arcfour-tests index c6ebcb663f..3c22ae49d8 100644 --- a/modules/crypto/gc-arcfour-tests +++ b/modules/crypto/gc-arcfour-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-arcfour check_PROGRAMS += test-gc-arcfour -test_gc_arcfour_LDADD = $(LDADD) $(LIB_GETRANDOM) +test_gc_arcfour_LDADD = $(LDADD) $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-arctwo-tests b/modules/crypto/gc-arctwo-tests index 6e74c80c2f..8bd22cc0e6 100644 --- a/modules/crypto/gc-arctwo-tests +++ b/modules/crypto/gc-arctwo-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-arctwo check_PROGRAMS += test-gc-arctwo -test_gc_arctwo_LDADD = $(LDADD) $(LIB_GETRANDOM) +test_gc_arctwo_LDADD = $(LDADD) $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-des-tests b/modules/crypto/gc-des-tests index 5d1bd46ee8..cb5035e014 100644 --- a/modules/crypto/gc-des-tests +++ b/modules/crypto/gc-des-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-des check_PROGRAMS += test-gc-des -test_gc_des_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_des_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-hmac-md5-tests b/modules/crypto/gc-hmac-md5-tests index 345ba872ac..a3f7533b78 100644 --- a/modules/crypto/gc-hmac-md5-tests +++ b/modules/crypto/gc-hmac-md5-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-hmac-md5 check_PROGRAMS += test-gc-hmac-md5 -test_gc_hmac_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_hmac_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-hmac-sha1-tests b/modules/crypto/gc-hmac-sha1-tests index c1effd7864..d473db6a6e 100644 --- a/modules/crypto/gc-hmac-sha1-tests +++ b/modules/crypto/gc-hmac-sha1-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-hmac-sha1 check_PROGRAMS += test-gc-hmac-sha1 -test_gc_hmac_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_hmac_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-hmac-sha256-tests b/modules/crypto/gc-hmac-sha256-tests index de0370fe09..596524cedf 100644 --- a/modules/crypto/gc-hmac-sha256-tests +++ b/modules/crypto/gc-hmac-sha256-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-hmac-sha256 check_PROGRAMS += test-gc-hmac-sha256 -test_gc_hmac_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_hmac_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-hmac-sha512-tests b/modules/crypto/gc-hmac-sha512-tests index e1c2e478f0..a03da0cbc3 100644 --- a/modules/crypto/gc-hmac-sha512-tests +++ b/modules/crypto/gc-hmac-sha512-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-hmac-sha512 check_PROGRAMS += test-gc-hmac-sha512 -test_gc_hmac_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_hmac_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-md2-tests b/modules/crypto/gc-md2-tests index b7ef11ff7c..9600d8df19 100644 --- a/modules/crypto/gc-md2-tests +++ b/modules/crypto/gc-md2-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-md2 check_PROGRAMS += test-gc-md2 -test_gc_md2_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_md2_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-md4-tests b/modules/crypto/gc-md4-tests index 0b32e7e52f..9d9b4aa610 100644 --- a/modules/crypto/gc-md4-tests +++ b/modules/crypto/gc-md4-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-md4 check_PROGRAMS += test-gc-md4 -test_gc_md4_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_md4_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-md5-tests b/modules/crypto/gc-md5-tests index 4e4b8f8023..c4f0cd9ab7 100644 --- a/modules/crypto/gc-md5-tests +++ b/modules/crypto/gc-md5-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-md5 check_PROGRAMS += test-gc-md5 -test_gc_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-pbkdf2-sha1-tests b/modules/crypto/gc-pbkdf2-sha1-tests index b1d73c785e..51996c0949 100644 --- a/modules/crypto/gc-pbkdf2-sha1-tests +++ b/modules/crypto/gc-pbkdf2-sha1-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-pbkdf2-sha1 check_PROGRAMS += test-gc-pbkdf2-sha1 -test_gc_pbkdf2_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_pbkdf2_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-pbkdf2-tests b/modules/crypto/gc-pbkdf2-tests index f5eac92289..f2dbb5db45 100644 --- a/modules/crypto/gc-pbkdf2-tests +++ b/modules/crypto/gc-pbkdf2-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-pbkdf2 check_PROGRAMS += test-gc-pbkdf2 -test_gc_pbkdf2_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_pbkdf2_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-random b/modules/crypto/gc-random index 0e1bd76e4e..8d635fcae4 100644 --- a/modules/crypto/gc-random +++ b/modules/crypto/gc-random @@ -16,7 +16,7 @@ Include: "gc.h" Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) License: LGPLv2+ diff --git a/modules/crypto/gc-rijndael-tests b/modules/crypto/gc-rijndael-tests index 7c87920df6..a6ad2f8ae4 100644 --- a/modules/crypto/gc-rijndael-tests +++ b/modules/crypto/gc-rijndael-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-rijndael check_PROGRAMS += test-gc-rijndael -test_gc_rijndael_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_rijndael_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-sha1-tests b/modules/crypto/gc-sha1-tests index afa1ba2f35..c19cffa1f3 100644 --- a/modules/crypto/gc-sha1-tests +++ b/modules/crypto/gc-sha1-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-sha1 check_PROGRAMS += test-gc-sha1 -test_gc_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-sha256-tests b/modules/crypto/gc-sha256-tests index 13c55c5930..eb049c8852 100644 --- a/modules/crypto/gc-sha256-tests +++ b/modules/crypto/gc-sha256-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-sha256 check_PROGRAMS += test-gc-sha256 -test_gc_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-sha512-tests b/modules/crypto/gc-sha512-tests index 22cb3bab4c..0e650235d9 100644 --- a/modules/crypto/gc-sha512-tests +++ b/modules/crypto/gc-sha512-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-sha512 check_PROGRAMS += test-gc-sha512 -test_gc_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-sm3-tests b/modules/crypto/gc-sm3-tests index f64322a6d9..5afdcac1ae 100644 --- a/modules/crypto/gc-sm3-tests +++ b/modules/crypto/gc-sm3-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc-sm3 check_PROGRAMS += test-gc-sm3 -test_gc_sm3_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_sm3_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/crypto/gc-tests b/modules/crypto/gc-tests index 5a16ba3b3b..c137ed0543 100644 --- a/modules/crypto/gc-tests +++ b/modules/crypto/gc-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc check_PROGRAMS += test-gc -test_gc_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM) +test_gc_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB) diff --git a/modules/getentropy b/modules/getentropy index 0088b8b8e1..2f4bcf054c 100644 --- a/modules/getentropy +++ b/modules/getentropy @@ -24,7 +24,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) License: LGPL diff --git a/modules/getentropy-tests b/modules/getentropy-tests index 7ad786109c..f384698d80 100644 --- a/modules/getentropy-tests +++ b/modules/getentropy-tests @@ -10,4 +10,4 @@ configure.ac: Makefile.am: TESTS += test-getentropy check_PROGRAMS += test-getentropy -test_getentropy_LDADD = $(LDADD) $(LIB_GETRANDOM) +test_getentropy_LDADD = $(LDADD) $(GETRANDOM_LIB) diff --git a/modules/getrandom b/modules/getrandom index fa468ed7f3..a8b14781d0 100644 --- a/modules/getrandom +++ b/modules/getrandom @@ -28,7 +28,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) License: LGPLv2+ diff --git a/modules/getrandom-tests b/modules/getrandom-tests index b7f64dd205..1f9c67b884 100644 --- a/modules/getrandom-tests +++ b/modules/getrandom-tests @@ -10,4 +10,4 @@ configure.ac: Makefile.am: TESTS += test-getrandom check_PROGRAMS += test-getrandom -test_getrandom_LDADD = $(LDADD) @LIB_GETRANDOM@ +test_getrandom_LDADD = $(LDADD) @GETRANDOM_LIB@ diff --git a/modules/getumask b/modules/getumask index 4e8b843ed2..5e6cc2f211 100644 --- a/modules/getumask +++ b/modules/getumask @@ -30,7 +30,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) $(LIBTHREAD) diff --git a/modules/getumask-tests b/modules/getumask-tests index 455ef0ff6b..ce506e075f 100644 --- a/modules/getumask-tests +++ b/modules/getumask-tests @@ -10,4 +10,4 @@ configure.ac: Makefile.am: TESTS += test-getumask check_PROGRAMS += test-getumask -test_getumask_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD) +test_getumask_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD) diff --git a/modules/javacomp b/modules/javacomp index 838aa2b633..bd0a1ebf09 100644 --- a/modules/javacomp +++ b/modules/javacomp @@ -43,7 +43,7 @@ Include: Link: $(LIB_MBRTOWC) -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(LIBTHREAD) License: diff --git a/modules/mkdtemp b/modules/mkdtemp index 63a62c3f54..5f65e45a6b 100644 --- a/modules/mkdtemp +++ b/modules/mkdtemp @@ -27,7 +27,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/mkostemp b/modules/mkostemp index a77f5b7538..467fb109ae 100644 --- a/modules/mkostemp +++ b/modules/mkostemp @@ -30,7 +30,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/mkostemps b/modules/mkostemps index 051ca8368f..92ef9ea29e 100644 --- a/modules/mkostemps +++ b/modules/mkostemps @@ -27,7 +27,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/mkstemp b/modules/mkstemp index 22de2c4e99..523c7b8d11 100644 --- a/modules/mkstemp +++ b/modules/mkstemp @@ -29,7 +29,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/mkstemps b/modules/mkstemps index 6ae3beeecf..4cb0f52315 100644 --- a/modules/mkstemps +++ b/modules/mkstemps @@ -26,7 +26,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/stdio-c++-tests b/modules/stdio-c++-tests index a4e7dd9a11..450a85c6d0 100644 --- a/modules/stdio-c++-tests +++ b/modules/stdio-c++-tests @@ -16,5 +16,5 @@ if ANSICXX TESTS += test-stdio-c++ check_PROGRAMS += test-stdio-c++ test_stdio_c___SOURCES = test-stdio-c++.cc test-stdio-c++2.cc -test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(LIB_GETRANDOM) +test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB) endif diff --git a/modules/stdlib-c++-tests b/modules/stdlib-c++-tests index b9de379d08..2672dd5210 100644 --- a/modules/stdlib-c++-tests +++ b/modules/stdlib-c++-tests @@ -16,5 +16,5 @@ if ANSICXX TESTS += test-stdlib-c++ check_PROGRAMS += test-stdlib-c++ test_stdlib_c___SOURCES = test-stdlib-c++.cc test-stdlib-c++2.cc -test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIB_GETRANDOM) +test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB) endif diff --git a/modules/stdlib-safer b/modules/stdlib-safer index 80414b3207..3a33a2c941 100644 --- a/modules/stdlib-safer +++ b/modules/stdlib-safer @@ -21,7 +21,7 @@ Include: "stdlib-safer.h" Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) License: GPL diff --git a/modules/supersede b/modules/supersede index 64a25e53ad..3118fad426 100644 --- a/modules/supersede +++ b/modules/supersede @@ -36,7 +36,7 @@ Include: Link: $(LIB_ACL) -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) $(LIBTHREAD) diff --git a/modules/supersede-tests b/modules/supersede-tests index 5166736fce..f3a9d777d9 100644 --- a/modules/supersede-tests +++ b/modules/supersede-tests @@ -19,4 +19,4 @@ configure.ac: Makefile.am: TESTS += test-supersede check_PROGRAMS += test-supersede -test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD) +test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD) diff --git a/modules/sys_random-c++-tests b/modules/sys_random-c++-tests index 5b3c505fd4..3c006edb7e 100644 --- a/modules/sys_random-c++-tests +++ b/modules/sys_random-c++-tests @@ -15,5 +15,5 @@ if ANSICXX TESTS += test-sys_random-c++ check_PROGRAMS += test-sys_random-c++ test_sys_random_c___SOURCES = test-sys_random-c++.cc -test_sys_random_c___LDADD = $(LDADD) $(LIB_GETRANDOM) +test_sys_random_c___LDADD = $(LDADD) $(GETRANDOM_LIB) endif diff --git a/modules/sys_stat-c++-tests b/modules/sys_stat-c++-tests index c12ad60819..2dba0c1ee5 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) $(LIB_GETRANDOM) +test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC) $(GETRANDOM_LIB) endif diff --git a/modules/tempname b/modules/tempname index 27699a8fe3..292c990dea 100644 --- a/modules/tempname +++ b/modules/tempname @@ -32,7 +32,7 @@ Include: "tempname.h" Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/tempname-tests b/modules/tempname-tests index 2ff355281e..cadbe08cb0 100644 --- a/modules/tempname-tests +++ b/modules/tempname-tests @@ -13,4 +13,4 @@ configure.ac: Makefile.am: TESTS += test-tempname check_PROGRAMS += test-tempname -test_tempname_LDADD = $(LDADD) $(LIB_GETRANDOM) $(CLOCK_TIME_LIB) +test_tempname_LDADD = $(LDADD) $(GETRANDOM_LIB) $(CLOCK_TIME_LIB) diff --git a/modules/tmpfile b/modules/tmpfile index 6a13f830f5..261189c657 100644 --- a/modules/tmpfile +++ b/modules/tmpfile @@ -30,7 +30,7 @@ Include: Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/tmpfile-safer b/modules/tmpfile-safer index fc9db9ef7f..07ff47b437 100644 --- a/modules/tmpfile-safer +++ b/modules/tmpfile-safer @@ -21,7 +21,7 @@ Include: "stdio-safer.h" Link: -$(LIB_GETRANDOM) +$(GETRANDOM_LIB) $(CLOCK_TIME_LIB) License: diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests index 4028a1178a..7a82baa22a 100644 --- a/modules/unistd-c++-tests +++ b/modules/unistd-c++-tests @@ -15,5 +15,5 @@ if ANSICXX TESTS += test-unistd-c++ check_PROGRAMS += test-unistd-c++ test_unistd_c___SOURCES = test-unistd-c++.cc -test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(LIB_GETRANDOM) +test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(GETRANDOM_LIB) endif -- 2.34.1