Rename module sys_times to sys_times-h.

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

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

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

diff --git a/modules/posixcheck b/modules/posixcheck
index e3f9bc22c204451a434520aa01fffd5a5be6beb0..343bdf41334e5ad4fbdd2521454967c211e1b5b7 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -40,7 +40,7 @@ sys_select-h
 sys_socket-h
 sys_stat-h
 sys_time-h
-sys_times
+sys_times-h
 sys_utsname
 sys_wait
 termios

diff --git a/modules/sys_times b/modules/sys_times
index 6a4a092963eaf66f6bbd65bdfe21b8a02407c445..5afefb3c74b2264c761db5c3636ea1d93297aa1a 100644 (file)
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -1,44 +1,20 @@
 Description:
 A <sys/times.h> for systems lacking it.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_times-h' instead.
+
 Files:
-lib/sys_times.in.h
-m4/sys_times_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/warn-on-use
+sys_times-h
 
 configure.ac:
-gl_SYS_TIMES_H
-gl_SYS_TIMES_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/times.h
-
-# We need the following in order to create <sys/times.h> when the system
-# doesn't have one that works with the given compiler.
-sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
-       $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-             -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_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_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \
-             -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \
-             -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \
-             -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             $(srcdir)/sys_times.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/times.h sys/times.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/times.h>
@@ -47,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Simon Josefsson

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

diff --git a/modules/sys_times-h b/modules/sys_times-h
new file mode 100644 (file)
index 0000000..6a4a092
--- /dev/null
+++ b/modules/sys_times-h
@@ -0,0 +1,50 @@
+Description:
+A <sys/times.h> for systems lacking it.
+
+Files:
+lib/sys_times.in.h
+m4/sys_times_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/warn-on-use
+
+configure.ac:
+gl_SYS_TIMES_H
+gl_SYS_TIMES_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/times.h
+
+# We need the following in order to create <sys/times.h> when the system
+# doesn't have one that works with the given compiler.
+sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+       $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_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_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \
+             -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \
+             -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \
+             -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \
+             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             $(srcdir)/sys_times.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/times.h sys/times.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/times.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Simon Josefsson

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

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

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

diff --git a/modules/times b/modules/times
index 4b15d0f8b8ff5e54a698fb9c2bb0c5f0c9fedae7..622acfcba47c8008fd71680fa54dbe5a3ba871b6 100644 (file)
--- a/modules/times
+++ b/modules/times
@@ -6,7 +6,7 @@ lib/times.c
 m4/times.m4
 
 Depends-on:
-sys_times
+sys_times-h
 
 configure.ac:
 gl_FUNC_TIMES

diff --git a/modules/timevar b/modules/timevar
index 7e966531fc3e72fa730f350e0e2b3a12ad46c57f..d4a645125c650e14c9907ecb319560c09f4358cd 100644 (file)
--- a/modules/timevar
+++ b/modules/timevar
@@ -17,7 +17,7 @@ gettext-h
 gnulib-i18n
 stdlib-h
 sys_time-h
-sys_times
+sys_times-h
 xalloc
 
 Makefile.am:

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

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