]> Savannah Git Hosting - gnulib.git/commitdiff
Rename module mntent to mntent-h.
authorBruno Haible <bruno@clisp.org>
Fri, 27 Dec 2024 22:14:24 +0000 (23:14 +0100)
committerBruno Haible <bruno@clisp.org>
Fri, 27 Dec 2024 22:14:24 +0000 (23:14 +0100)
* modules/mntent-h: Renamed from modules/mntent.
* doc/glibc-headers/mntent.texi: Update.
* modules/* (Depends-on): Update.
* modules/mntent: New file.

ChangeLog
doc/glibc-headers/mntent.texi
modules/hasmntopt
modules/mntent
modules/mntent-h [new file with mode: 0644]

index 7157d7d7b71b8d219dcc26d74dfe969dd7e71d9b..35584ea8fad46d6cb57513f01a5735ce86c467fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module mntent to mntent-h.
+       * modules/mntent-h: Renamed from modules/mntent.
+       * doc/glibc-headers/mntent.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/mntent: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module math to math-h.
index cf19736dc1a13685ae026121a4d1b2314cf50d45..fabb1b3300c80cae981395843330834b66a08d60 100644 (file)
@@ -19,8 +19,8 @@ Documentation:
 @uref{https://www.kernel.org/doc/man-pages/online/pages/man3/setmntent.3.html,,man setmntent}.
 @end itemize
 
-Gnulib module: mntent
-@mindex mntent
+Gnulib module: mntent-h
+@mindex mntent-h
 
 Portability problems fixed by Gnulib:
 @itemize
index 6fdd897f0b68242a4d76df12e39539799acb1092..31b4d9ad02f6b79f949e39f939329af69cf14bdc 100644 (file)
@@ -6,7 +6,7 @@ lib/hasmntopt.c
 m4/hasmntopt.m4
 
 Depends-on:
-mntent
+mntent-h
 
 configure.ac:
 gl_FUNC_HASMNTOPT
index e0926b4760ea3f1b2ead7f7a1dfaa752d89c889e..dc797195705a1bb1ac47dcc5421635fcf31f0856 100644 (file)
@@ -1,50 +1,20 @@
 Description:
 <mntent.h> with more declarations.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'mntent-h' instead.
+
 Files:
-lib/mntent.in.h
-m4/mntent_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
+mntent-h
 
 configure.ac:
-gl_MNTENT_H
-gl_MNTENT_H_REQUIRE_DEFAULTS
-gl_CONDITIONAL_HEADER([mntent.h])
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(MNTENT_H)
-
-# We need the following in order to create <mntent.h> when desired.
-if GL_GENERATE_MNTENT_H
-mntent.h: mntent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-       $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(AM_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_MNTENT_H''@|$(NEXT_MNTENT_H)|g' \
-             -e 's/@''GNULIB_HASMNTOPT''@/$(GNULIB_HASMNTOPT)/g' \
-             -e 's|@''HAVE_HASMNTOPT''@|$(HAVE_HASMNTOPT)|g' \
-             -e 's|@''HAVE_SETMNTENT''@|$(HAVE_SETMNTENT)|g' \
-             -e 's|@''REPLACE_HASMNTOPT''@|$(REPLACE_HASMNTOPT)|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)/mntent.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-else
-mntent.h: $(top_builddir)/config.status
-       rm -f $@
-endif
-MOSTLYCLEANFILES += mntent.h mntent.h-t
 
 Include:
 #if HAVE_MNTENT_H
@@ -55,4 +25,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all
diff --git a/modules/mntent-h b/modules/mntent-h
new file mode 100644 (file)
index 0000000..e0926b4
--- /dev/null
@@ -0,0 +1,58 @@
+Description:
+<mntent.h> with more declarations.
+
+Files:
+lib/mntent.in.h
+m4/mntent_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_MNTENT_H
+gl_MNTENT_H_REQUIRE_DEFAULTS
+gl_CONDITIONAL_HEADER([mntent.h])
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += $(MNTENT_H)
+
+# We need the following in order to create <mntent.h> when desired.
+if GL_GENERATE_MNTENT_H
+mntent.h: mntent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+       $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_MNTENT_H''@|$(NEXT_MNTENT_H)|g' \
+             -e 's/@''GNULIB_HASMNTOPT''@/$(GNULIB_HASMNTOPT)/g' \
+             -e 's|@''HAVE_HASMNTOPT''@|$(HAVE_HASMNTOPT)|g' \
+             -e 's|@''HAVE_SETMNTENT''@|$(HAVE_SETMNTENT)|g' \
+             -e 's|@''REPLACE_HASMNTOPT''@|$(REPLACE_HASMNTOPT)|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)/mntent.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+else
+mntent.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += mntent.h mntent.h-t
+
+Include:
+#if HAVE_MNTENT_H
+<mntent.h>
+#endif
+
+License:
+LGPLv2+
+
+Maintainer:
+all