Rename module monetary to monetary-h.

* modules/monetary-h: Renamed from modules/monetary.
* modules/monetary-h-tests: Renamed from modules/monetary-tests.
* modules/monetary-h-c++-tests: Renamed from modules/monetary-c++-tests.
* tests/test-monetary-h.c: Renamed from tests/test-monetary.c.
* tests/test-monetary-h-c++.cc: Renamed from tests/test-monetary-c++.cc.
* doc/posix-headers/monetary.texi: Update.
* modules/* (Depends-on): Update.
* modules/monetary: New file.

diff --git a/ChangeLog b/ChangeLog
index 35584ea8fad46d6cb57513f01a5735ce86c467fe..b7aca0d7fe4dcb31e613d84ac067caef4b290380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module monetary to monetary-h.
+       * modules/monetary-h: Renamed from modules/monetary.
+       * modules/monetary-h-tests: Renamed from modules/monetary-tests.
+       * modules/monetary-h-c++-tests: Renamed from modules/monetary-c++-tests.
+       * tests/test-monetary-h.c: Renamed from tests/test-monetary.c.
+       * tests/test-monetary-h-c++.cc: Renamed from tests/test-monetary-c++.cc.
+       * doc/posix-headers/monetary.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/monetary: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module mntent to mntent-h.

diff --git a/doc/posix-headers/monetary.texi b/doc/posix-headers/monetary.texi
index 023d353298a7114cc20490c435d30d70a133ae75..6184992e28cc81753ce4b101c314992c20baaeaf 100644 (file)
--- a/doc/posix-headers/monetary.texi
+++ b/doc/posix-headers/monetary.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/monetary.h.html}
 
-Gnulib module: monetary
-@mindex monetary
+Gnulib module: monetary-h
+@mindex monetary-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/monetary b/modules/monetary
index 9b9239770d24aff3607e8f887f509094a2d2282b..b7d6135f038e737be3e55c03600b51719ef4ad3d 100644 (file)
--- a/modules/monetary
+++ b/modules/monetary
@@ -1,52 +1,20 @@
 Description:
 A substitute <monetary.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'monetary-h' instead.
+
 Files:
-lib/monetary.in.h
-m4/monetary_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
+monetary-h
 
 configure.ac:
-gl_MONETARY_H
-gl_MONETARY_H_REQUIRE_DEFAULTS
-gl_CONDITIONAL_HEADER([monetary.h])
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(MONETARY_H)
-
-# We need the following in order to create <monetary.h> when the system
-# doesn't have one that works with the given compiler.
-if GL_GENERATE_MONETARY_H
-monetary.h: monetary.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
-@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(gl_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-             -e 's|@''HAVE_MONETARY_H''@|$(HAVE_MONETARY_H)|g' \
-             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-             -e 's|@''NEXT_MONETARY_H''@|$(NEXT_MONETARY_H)|g' \
-             -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-             -e 's/@''GNULIB_STRFMON_L''@/$(GNULIB_STRFMON_L)/g' \
-             -e 's|@''HAVE_STRFMON_L''@|$(HAVE_STRFMON_L)|g' \
-             -e 's|@''REPLACE_STRFMON_L''@|$(REPLACE_STRFMON_L)|g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             $(srcdir)/monetary.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-else
-monetary.h: $(top_builddir)/config.status
-       rm -f $@
-endif
-MOSTLYCLEANFILES += monetary.h monetary.h-t
 
 Include:
 #if HAVE_MONETARY_H
@@ -57,4 +25,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

diff --git a/modules/monetary-c++-tests b/modules/monetary-c++-tests
deleted file mode 100644 (file)
index bd4d52e..0000000
--- a/modules/monetary-c++-tests
+++ /dev/null
@@ -1,18 +0,0 @@
-Files:
-tests/test-monetary-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-monetary-c++
-check_PROGRAMS += test-monetary-c++
-test_monetary_c___SOURCES = test-monetary-c++.cc
-endif

diff --git a/modules/monetary-h b/modules/monetary-h
new file mode 100644 (file)
index 0000000..9b92397
--- /dev/null
+++ b/modules/monetary-h
@@ -0,0 +1,60 @@
+Description:
+A substitute <monetary.h>.
+
+Files:
+lib/monetary.in.h
+m4/monetary_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_MONETARY_H
+gl_MONETARY_H_REQUIRE_DEFAULTS
+gl_CONDITIONAL_HEADER([monetary.h])
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += $(MONETARY_H)
+
+# We need the following in order to create <monetary.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_MONETARY_H
+monetary.h: monetary.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(gl_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_MONETARY_H''@|$(HAVE_MONETARY_H)|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_MONETARY_H''@|$(NEXT_MONETARY_H)|g' \
+             -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+             -e 's/@''GNULIB_STRFMON_L''@/$(GNULIB_STRFMON_L)/g' \
+             -e 's|@''HAVE_STRFMON_L''@|$(HAVE_STRFMON_L)|g' \
+             -e 's|@''REPLACE_STRFMON_L''@|$(REPLACE_STRFMON_L)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             $(srcdir)/monetary.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+else
+monetary.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += monetary.h monetary.h-t
+
+Include:
+#if HAVE_MONETARY_H
+<monetary.h>
+#endif
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/monetary-h-c++-tests b/modules/monetary-h-c++-tests
new file mode 100644 (file)
index 0000000..12df22f
--- /dev/null
+++ b/modules/monetary-h-c++-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-monetary-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-monetary-h-c++
+check_PROGRAMS += test-monetary-h-c++
+test_monetary_h_c___SOURCES = test-monetary-h-c++.cc
+endif

diff --git a/modules/monetary-h-tests b/modules/monetary-h-tests
new file mode 100644 (file)
index 0000000..27b359f
--- /dev/null
+++ b/modules/monetary-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-monetary-h.c
+
+Depends-on:
+monetary-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-monetary-h
+check_PROGRAMS += test-monetary-h

diff --git a/modules/monetary-tests b/modules/monetary-tests
deleted file mode 100644 (file)
index 7b93396..0000000
--- a/modules/monetary-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-monetary.c
-
-Depends-on:
-monetary-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-monetary
-check_PROGRAMS += test-monetary

diff --git a/modules/posixcheck b/modules/posixcheck
index 7e9c413dcb5fd9efc1ab6c92417c0cc5f198ce4b..3c04ecc4d493f063c6cf5dfd851ed44e49614070 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -19,7 +19,7 @@ langinfo-h
 locale-h
 malloc-h
 math-h
-monetary
+monetary-h
 netdb
 poll-h
 pthread-h

diff --git a/modules/strfmon_l b/modules/strfmon_l
index 31dafe748dfe9407afcd56476f73a9ad6be29fc5..bbad6e1a67ad098a5159bb76f136351418a37551 100644 (file)
--- a/modules/strfmon_l
+++ b/modules/strfmon_l
@@ -8,7 +8,7 @@ m4/locale-fr.m4
 m4/codeset.m4
 
 Depends-on:
-monetary
+monetary-h
 extensions
 stdbool         [test $REPLACE_STRFMON_L = 1]
 

diff --git a/tests/test-monetary-c++.cc b/tests/test-monetary-h-c++.cc
similarity index 100%
rename from tests/test-monetary-c++.cc
rename to tests/test-monetary-h-c++.cc

diff --git a/tests/test-monetary.c b/tests/test-monetary-h.c
similarity index 100%
rename from tests/test-monetary.c
rename to tests/test-monetary-h.c