Rename module utmp to utmp-h.

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

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

diff --git a/doc/glibc-headers/utmp.texi b/doc/glibc-headers/utmp.texi
index 07d280768290ad4478271e5f67f0401dc6dbfb91..5cb016d993bb4373f72a93f63ad885112d7e598c 100644 (file)
--- a/doc/glibc-headers/utmp.texi
+++ b/doc/glibc-headers/utmp.texi
@@ -17,8 +17,8 @@ Documentation:
 @uref{https://www.kernel.org/doc/man-pages/online/pages/man5/utmp.5.html,,man utmp}.
 @end itemize
 
-Gnulib module: utmp
-@mindex utmp
+Gnulib module: utmp-h
+@mindex utmp-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/login_tty b/modules/login_tty
index 15f3cc2698e2168ad8a7dbecbb624a86f057f0c9..c37a2dc1ab1b94da2cb0329abdf2291b6f19afa7 100644 (file)
--- a/modules/login_tty
+++ b/modules/login_tty
@@ -8,7 +8,7 @@ m4/login_tty.m4
 m4/pty.m4
 
 Depends-on:
-utmp
+utmp-h
 sys_ioctl-h
 open            [test $HAVE_LOGIN_TTY = 0]
 

diff --git a/modules/posixcheck b/modules/posixcheck
index ba980e62431733e4890031e8f4db47dd59a26bdd..9c5788738ac25bf615693e54fab7fc23c5dfe568 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -49,7 +49,7 @@ time-h
 uchar-h
 unistd-h
 utime-h
-utmp
+utmp-h
 wchar
 wctype-h
 

diff --git a/modules/utmp b/modules/utmp
index d5ba411d875666d3fd7cb38333a46c46e420fbbf..509be677c9b73c743301aaebeea803a76ba002c3 100644 (file)
--- a/modules/utmp
+++ b/modules/utmp
@@ -1,48 +1,20 @@
 Description:
 A GNU-like <utmp.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'utmp-h' instead.
+
 Files:
-lib/utmp.in.h
-m4/utmp_h.m4
-m4/pty_h.m4
-m4/termios_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/c++defs
-snippet/warn-on-use
+utmp-h
 
 configure.ac:
-gl_UTMP_H
-gl_UTMP_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += utmp.h
-
-# We need the following in order to create <utmp.h> when the system
-# doesn't have one that works with the given compiler.
-utmp.h: utmp.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_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_UTMP_H''@/$(HAVE_UTMP_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_UTMP_H''@|$(NEXT_UTMP_H)|g' \
-             -e 's|@''HAVE_UTIL_H''@|$(HAVE_UTIL_H)|g' \
-             -e 's|@''HAVE_LIBUTIL_H''@|$(HAVE_LIBUTIL_H)|g' \
-             -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \
-             -e 's/@''GNULIB_LOGIN_TTY''@/$(GNULIB_LOGIN_TTY)/g' \
-             -e 's|@''HAVE_LOGIN_TTY''@|$(HAVE_LOGIN_TTY)|g' \
-             -e 's|@''REPLACE_LOGIN_TTY''@|$(REPLACE_LOGIN_TTY)|g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             $(srcdir)/utmp.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += utmp.h utmp.h-t
 
 Include:
 <utmp.h>
@@ -51,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

diff --git a/modules/utmp-c++-tests b/modules/utmp-c++-tests
deleted file mode 100644 (file)
index 814dfc3..0000000
--- a/modules/utmp-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-utmp-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-utmp-c++
-check_PROGRAMS += test-utmp-c++
-test_utmp_c___SOURCES = test-utmp-c++.cc
-test_utmp_c___LDADD = $(LDADD) $(PTY_LIB)
-endif

diff --git a/modules/utmp-h b/modules/utmp-h
new file mode 100644 (file)
index 0000000..d5ba411
--- /dev/null
+++ b/modules/utmp-h
@@ -0,0 +1,54 @@
+Description:
+A GNU-like <utmp.h>.
+
+Files:
+lib/utmp.in.h
+m4/utmp_h.m4
+m4/pty_h.m4
+m4/termios_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_UTMP_H
+gl_UTMP_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += utmp.h
+
+# We need the following in order to create <utmp.h> when the system
+# doesn't have one that works with the given compiler.
+utmp.h: utmp.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_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_UTMP_H''@/$(HAVE_UTMP_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_UTMP_H''@|$(NEXT_UTMP_H)|g' \
+             -e 's|@''HAVE_UTIL_H''@|$(HAVE_UTIL_H)|g' \
+             -e 's|@''HAVE_LIBUTIL_H''@|$(HAVE_LIBUTIL_H)|g' \
+             -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \
+             -e 's/@''GNULIB_LOGIN_TTY''@/$(GNULIB_LOGIN_TTY)/g' \
+             -e 's|@''HAVE_LOGIN_TTY''@|$(HAVE_LOGIN_TTY)|g' \
+             -e 's|@''REPLACE_LOGIN_TTY''@|$(REPLACE_LOGIN_TTY)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             $(srcdir)/utmp.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += utmp.h utmp.h-t
+
+Include:
+<utmp.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/utmp-h-c++-tests b/modules/utmp-h-c++-tests
new file mode 100644 (file)
index 0000000..dc852fc
--- /dev/null
+++ b/modules/utmp-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-utmp-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-utmp-h-c++
+check_PROGRAMS += test-utmp-h-c++
+test_utmp_h_c___SOURCES = test-utmp-h-c++.cc
+test_utmp_h_c___LDADD = $(LDADD) $(PTY_LIB)
+endif

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

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

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

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