Rename module sys_file to sys_file-h.

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

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

diff --git a/doc/glibc-headers/sys_file.texi b/doc/glibc-headers/sys_file.texi
index 71513360948fe6433b61530389156f8f28f83907..1a4ceb89ff4d6dd70133301f874878170aa97545 100644 (file)
--- a/doc/glibc-headers/sys_file.texi
+++ b/doc/glibc-headers/sys_file.texi
@@ -3,8 +3,8 @@
 
 Declares the function @code{flock}.
 
-Gnulib module: sys_file
-@mindex sys_file
+Gnulib module: sys_file-h
+@mindex sys_file-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/flock b/modules/flock
index 75ce48e584e019b5268fd272d1a00245c0c62772..0fb6274eb21405a1be4c9d5651f320dabbffb437 100644 (file)
--- a/modules/flock
+++ b/modules/flock
@@ -6,7 +6,7 @@ lib/flock.c
 m4/flock.m4
 
 Depends-on:
-sys_file
+sys_file-h
 msvc-nothrow    [test $HAVE_FLOCK = 0]
 
 configure.ac:

diff --git a/modules/posixcheck b/modules/posixcheck
index 2371aaf0e48b30f26e9dded89fdda17a7e7e06ff..98f560548e82a6013b2bdeda5edea5de86fb6f09 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -32,7 +32,7 @@ stdio-h
 stdlib-h
 string-h
 strings-h
-sys_file
+sys_file-h
 sys_ioctl
 sys_random
 sys_resource

diff --git a/modules/sys_file b/modules/sys_file
index a06a2f43760ce1feaad9c9bd625ff70466c213f3..59e2b61f2ebb5f562109adb553a5c165c0f97ef7 100644 (file)
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -1,41 +1,20 @@
 Description:
 <sys/file.h> for systems with an incomplete header.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_file-h' instead.
+
 Files:
-lib/sys_file.in.h
-m4/sys_file_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/warn-on-use
+sys_file-h
 
 configure.ac:
-gl_SYS_FILE_H
-gl_SYS_FILE_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/file.h
-
-# We need the following in order to create <sys/file.h> when the system
-# has one that is incomplete.
-sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_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_FILE_H''@/$(HAVE_SYS_FILE_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_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \
-             -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \
-             -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             $(srcdir)/sys_file.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/file.h sys/file.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/file.h>
@@ -44,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

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

diff --git a/modules/sys_file-h b/modules/sys_file-h
new file mode 100644 (file)
index 0000000..a06a2f4
--- /dev/null
+++ b/modules/sys_file-h
@@ -0,0 +1,47 @@
+Description:
+<sys/file.h> for systems with an incomplete header.
+
+Files:
+lib/sys_file.in.h
+m4/sys_file_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/warn-on-use
+
+configure.ac:
+gl_SYS_FILE_H
+gl_SYS_FILE_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/file.h
+
+# We need the following in order to create <sys/file.h> when the system
+# has one that is incomplete.
+sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_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_FILE_H''@/$(HAVE_SYS_FILE_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_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \
+             -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \
+             -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             $(srcdir)/sys_file.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/file.h sys/file.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/file.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

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

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

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

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

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