From e41417a213d9faae961d5e883e7464d7dab3ccae Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Dec 2024 23:14:24 +0100 Subject: [PATCH] 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. --- ChangeLog | 8 +++++ doc/glibc-headers/mntent.texi | 4 +-- modules/hasmntopt | 2 +- modules/mntent | 45 +++++---------------------- modules/mntent-h | 58 +++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 41 deletions(-) create mode 100644 modules/mntent-h diff --git a/ChangeLog b/ChangeLog index 7157d7d7b7..35584ea8fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-12-27 Bruno Haible + + 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 Rename module math to math-h. diff --git a/doc/glibc-headers/mntent.texi b/doc/glibc-headers/mntent.texi index cf19736dc1..fabb1b3300 100644 --- a/doc/glibc-headers/mntent.texi +++ b/doc/glibc-headers/mntent.texi @@ -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 diff --git a/modules/hasmntopt b/modules/hasmntopt index 6fdd897f0b..31b4d9ad02 100644 --- a/modules/hasmntopt +++ b/modules/hasmntopt @@ -6,7 +6,7 @@ lib/hasmntopt.c m4/hasmntopt.m4 Depends-on: -mntent +mntent-h configure.ac: gl_FUNC_HASMNTOPT diff --git a/modules/mntent b/modules/mntent index e0926b4760..dc79719570 100644 --- a/modules/mntent +++ b/modules/mntent @@ -1,50 +1,20 @@ Description: 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 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 index 0000000000..e0926b4760 --- /dev/null +++ b/modules/mntent-h @@ -0,0 +1,58 @@ +Description: + 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 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 + +#endif + +License: +LGPLv2+ + +Maintainer: +all -- 2.39.5