From cc8bac309fe606d45a5818d1102dc068cfd5c703 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 25 Jun 2024 01:04:22 +0200 Subject: [PATCH] Ease maintainability of *printf-gnu modules. * modules/mixin/printf-gnu: New file. * modules/dprintf-gnu (Depends-on): Add it. * modules/fprintf-gnu (Depends-on): Likewise. * modules/obstack-printf-gnu (Depends-on): Likewise. * modules/printf-gnu (Depends-on): Likewise. * modules/snprintf-gnu (Depends-on): Likewise. * modules/sprintf-gnu (Depends-on): Likewise. * modules/vasnprintf-gnu (Depends-on): Likewise. * modules/vasnwprintf-gnu (Depends-on): Likewise. * modules/vasprintf-gnu (Depends-on): Likewise. * modules/vdprintf-gnu (Depends-on): Likewise. * modules/vfprintf-gnu (Depends-on): Likewise. * modules/vprintf-gnu (Depends-on): Likewise. * modules/vsnprintf-gnu (Depends-on): Likewise. * modules/vsprintf-gnu (Depends-on): Likewise. --- ChangeLog | 19 +++++++++++++++++++ modules/dprintf-gnu | 1 + modules/fprintf-gnu | 1 + modules/mixin/printf-gnu | 21 +++++++++++++++++++++ modules/obstack-printf-gnu | 1 + modules/printf-gnu | 1 + modules/snprintf-gnu | 1 + modules/sprintf-gnu | 1 + modules/vasnprintf-gnu | 1 + modules/vasnwprintf-gnu | 1 + modules/vasprintf-gnu | 1 + modules/vdprintf-gnu | 1 + modules/vfprintf-gnu | 1 + modules/vprintf-gnu | 1 + modules/vsnprintf-gnu | 1 + modules/vsprintf-gnu | 1 + 16 files changed, 54 insertions(+) create mode 100644 modules/mixin/printf-gnu diff --git a/ChangeLog b/ChangeLog index b2dd608715..3162246429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2024-06-24 Bruno Haible + + Ease maintainability of *printf-gnu modules. + * modules/mixin/printf-gnu: New file. + * modules/dprintf-gnu (Depends-on): Add it. + * modules/fprintf-gnu (Depends-on): Likewise. + * modules/obstack-printf-gnu (Depends-on): Likewise. + * modules/printf-gnu (Depends-on): Likewise. + * modules/snprintf-gnu (Depends-on): Likewise. + * modules/sprintf-gnu (Depends-on): Likewise. + * modules/vasnprintf-gnu (Depends-on): Likewise. + * modules/vasnwprintf-gnu (Depends-on): Likewise. + * modules/vasprintf-gnu (Depends-on): Likewise. + * modules/vdprintf-gnu (Depends-on): Likewise. + * modules/vfprintf-gnu (Depends-on): Likewise. + * modules/vprintf-gnu (Depends-on): Likewise. + * modules/vsnprintf-gnu (Depends-on): Likewise. + * modules/vsprintf-gnu (Depends-on): Likewise. + 2024-06-24 Bruno Haible Reduce duplication among *printf-posix modules. diff --git a/modules/dprintf-gnu b/modules/dprintf-gnu index b7228f9ec7..b4ca7270b4 100644 --- a/modules/dprintf-gnu +++ b/modules/dprintf-gnu @@ -13,6 +13,7 @@ m4/dprintf-gnu.m4 Depends-on: dprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_DPRINTF_GNU diff --git a/modules/fprintf-gnu b/modules/fprintf-gnu index fce7578459..fca6f4c79a 100644 --- a/modules/fprintf-gnu +++ b/modules/fprintf-gnu @@ -12,6 +12,7 @@ m4/fprintf-gnu.m4 Depends-on: fprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_FPRINTF_GNU diff --git a/modules/mixin/printf-gnu b/modules/mixin/printf-gnu new file mode 100644 index 0000000000..75f744c0db --- /dev/null +++ b/modules/mixin/printf-gnu @@ -0,0 +1,21 @@ +Description: +Module dependencies that are needed to compile lib/vasnprintf.c +with all extras for POSIX compliance and GNU compatibility. + +Files: + +Depends-on: +mixin/printf-posix + +configure.ac: +# Conditionally invoke gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS. + +Makefile.am: + +Include: + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/obstack-printf-gnu b/modules/obstack-printf-gnu index c6538ba701..3b51bed05e 100644 --- a/modules/obstack-printf-gnu +++ b/modules/obstack-printf-gnu @@ -12,6 +12,7 @@ m4/obstack-printf-gnu.m4 Depends-on: obstack-printf-posix +mixin/printf-gnu configure.ac: gl_FUNC_OBSTACK_PRINTF_GNU diff --git a/modules/printf-gnu b/modules/printf-gnu index f42a18fd5b..b73c239440 100644 --- a/modules/printf-gnu +++ b/modules/printf-gnu @@ -13,6 +13,7 @@ m4/printf-gnu.m4 Depends-on: printf-posix +mixin/printf-gnu configure.ac: gl_FUNC_PRINTF_GNU diff --git a/modules/snprintf-gnu b/modules/snprintf-gnu index 2850c16a34..3ef1c9c0e0 100644 --- a/modules/snprintf-gnu +++ b/modules/snprintf-gnu @@ -13,6 +13,7 @@ m4/snprintf-gnu.m4 Depends-on: snprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_SNPRINTF_GNU diff --git a/modules/sprintf-gnu b/modules/sprintf-gnu index 87daff3832..e63f6bc3e4 100644 --- a/modules/sprintf-gnu +++ b/modules/sprintf-gnu @@ -12,6 +12,7 @@ m4/sprintf-gnu.m4 Depends-on: sprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_SPRINTF_GNU diff --git a/modules/vasnprintf-gnu b/modules/vasnprintf-gnu index b5551f3011..6c1e82e0ce 100644 --- a/modules/vasnprintf-gnu +++ b/modules/vasnprintf-gnu @@ -13,6 +13,7 @@ m4/vasnprintf-gnu.m4 Depends-on: vasnprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VASNPRINTF_GNU diff --git a/modules/vasnwprintf-gnu b/modules/vasnwprintf-gnu index 582a185edd..91a96182e3 100644 --- a/modules/vasnwprintf-gnu +++ b/modules/vasnwprintf-gnu @@ -13,6 +13,7 @@ m4/vasnwprintf-gnu.m4 Depends-on: vasnwprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VASNWPRINTF_GNU diff --git a/modules/vasprintf-gnu b/modules/vasprintf-gnu index 9635b10f84..257bbbfc9c 100644 --- a/modules/vasprintf-gnu +++ b/modules/vasprintf-gnu @@ -12,6 +12,7 @@ m4/vasprintf-gnu.m4 Depends-on: vasprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VASPRINTF_GNU diff --git a/modules/vdprintf-gnu b/modules/vdprintf-gnu index b7bbb74fbe..6ad683f2ed 100644 --- a/modules/vdprintf-gnu +++ b/modules/vdprintf-gnu @@ -13,6 +13,7 @@ m4/vdprintf-gnu.m4 Depends-on: vdprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VDPRINTF_GNU diff --git a/modules/vfprintf-gnu b/modules/vfprintf-gnu index 71a8c82d3b..2062ef5426 100644 --- a/modules/vfprintf-gnu +++ b/modules/vfprintf-gnu @@ -12,6 +12,7 @@ m4/vfprintf-gnu.m4 Depends-on: vfprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VFPRINTF_GNU diff --git a/modules/vprintf-gnu b/modules/vprintf-gnu index 0fbefc85ba..a900a259d5 100644 --- a/modules/vprintf-gnu +++ b/modules/vprintf-gnu @@ -13,6 +13,7 @@ m4/vprintf-gnu.m4 Depends-on: vprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VPRINTF_GNU diff --git a/modules/vsnprintf-gnu b/modules/vsnprintf-gnu index 36c4cbd586..94085c3ca9 100644 --- a/modules/vsnprintf-gnu +++ b/modules/vsnprintf-gnu @@ -13,6 +13,7 @@ m4/vsnprintf-gnu.m4 Depends-on: vsnprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VSNPRINTF_GNU diff --git a/modules/vsprintf-gnu b/modules/vsprintf-gnu index d86b062e2e..9c2df1ee66 100644 --- a/modules/vsprintf-gnu +++ b/modules/vsprintf-gnu @@ -12,6 +12,7 @@ m4/vsprintf-gnu.m4 Depends-on: vsprintf-posix +mixin/printf-gnu configure.ac: gl_FUNC_VSPRINTF_GNU -- 2.39.5