From: Bruno Haible Date: Fri, 27 Dec 2024 22:41:47 +0000 (+0100) Subject: Rename module termios to termios-h. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9c55626fbc23ef6871ff127ed9dd6e7ea72b127;p=thirdparty%2Fgnulib.git Rename module termios to termios-h. * modules/termios-h: Renamed from modules/termios. * modules/termios-h-tests: Renamed from modules/termios-tests. * modules/termios-h-c++-tests: Renamed from modules/termios-c++-tests. * tests/test-termios-h.c: Renamed from tests/test-termios.c. * tests/test-termios-h-c++.cc: Renamed from tests/test-termios-c++.cc. * doc/posix-headers/termios.texi: Update. * modules/* (Depends-on): Update. * modules/termios: New file. --- diff --git a/ChangeLog b/ChangeLog index ff8b6ca139..23e8e7126d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2024-12-27 Bruno Haible + + Rename module termios to termios-h. + * modules/termios-h: Renamed from modules/termios. + * modules/termios-h-tests: Renamed from modules/termios-tests. + * modules/termios-h-c++-tests: Renamed from modules/termios-c++-tests. + * tests/test-termios-h.c: Renamed from tests/test-termios.c. + * tests/test-termios-h-c++.cc: Renamed from tests/test-termios-c++.cc. + * doc/posix-headers/termios.texi: Update. + * modules/* (Depends-on): Update. + * modules/termios: New file. + 2024-12-27 Bruno Haible Rename module sys_wait to sys_wait-h. diff --git a/doc/posix-headers/termios.texi b/doc/posix-headers/termios.texi index e0603f9fd8..a238790ac8 100644 --- a/doc/posix-headers/termios.texi +++ b/doc/posix-headers/termios.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/termios.h.html} -Gnulib module: termios -@mindex termios +Gnulib module: termios-h +@mindex termios-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/posixcheck b/modules/posixcheck index 053160f60d..e069fc6dc1 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -43,7 +43,7 @@ sys_time-h sys_times-h sys_utsname-h sys_wait-h -termios +termios-h threads-h time-h uchar diff --git a/modules/pty-h b/modules/pty-h index 7a1a2e3894..3c7775556f 100644 --- a/modules/pty-h +++ b/modules/pty-h @@ -10,7 +10,7 @@ gen-header include_next snippet/c++defs snippet/warn-on-use -termios +termios-h configure.ac: gl_PTY_H diff --git a/modules/tcgetsid b/modules/tcgetsid index f5300c8d42..f0547c2323 100644 --- a/modules/tcgetsid +++ b/modules/tcgetsid @@ -7,7 +7,7 @@ lib/tcgetsid.c m4/tcgetsid.m4 Depends-on: -termios +termios-h extensions sys_ioctl-h [test $HAVE_TCGETSID = 0] diff --git a/modules/termios b/modules/termios index 3af20592b9..cd66a3b0fb 100644 --- a/modules/termios +++ b/modules/termios @@ -1,45 +1,20 @@ Description: A that works around platform issues. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'termios-h' instead. + Files: -lib/termios.in.h -m4/termios_h.m4 -m4/pid_t.m4 Depends-on: -gen-header -include_next -snippet/c++defs -snippet/warn-on-use +termios-h configure.ac: -gl_TERMIOS_H -gl_TERMIOS_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += termios.h - -# We need the following in order to create when the system -# version does not have all declarations. -termios.h: termios.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \ - -e 's/@''GNULIB_TCGETSID''@/$(GNULIB_TCGETSID)/g' \ - -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \ - -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \ - -e 's|@''TERMIOS_H_DEFINES_STRUCT_WINSIZE''@|$(TERMIOS_H_DEFINES_STRUCT_WINSIZE)|g' \ - -e 's|@''SYS_IOCTL_H_DEFINES_STRUCT_WINSIZE''@|$(SYS_IOCTL_H_DEFINES_STRUCT_WINSIZE)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/termios.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += termios.h termios.h-t Include: @@ -48,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/termios-c++-tests b/modules/termios-c++-tests deleted file mode 100644 index a197581851..0000000000 --- a/modules/termios-c++-tests +++ /dev/null @@ -1,18 +0,0 @@ -Files: -tests/test-termios-c++.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-termios-c++ -check_PROGRAMS += test-termios-c++ -test_termios_c___SOURCES = test-termios-c++.cc -endif diff --git a/modules/termios-h b/modules/termios-h new file mode 100644 index 0000000000..3af20592b9 --- /dev/null +++ b/modules/termios-h @@ -0,0 +1,51 @@ +Description: +A that works around platform issues. + +Files: +lib/termios.in.h +m4/termios_h.m4 +m4/pid_t.m4 + +Depends-on: +gen-header +include_next +snippet/c++defs +snippet/warn-on-use + +configure.ac: +gl_TERMIOS_H +gl_TERMIOS_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += termios.h + +# We need the following in order to create when the system +# version does not have all declarations. +termios.h: termios.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \ + -e 's/@''GNULIB_TCGETSID''@/$(GNULIB_TCGETSID)/g' \ + -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \ + -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \ + -e 's|@''TERMIOS_H_DEFINES_STRUCT_WINSIZE''@|$(TERMIOS_H_DEFINES_STRUCT_WINSIZE)|g' \ + -e 's|@''SYS_IOCTL_H_DEFINES_STRUCT_WINSIZE''@|$(SYS_IOCTL_H_DEFINES_STRUCT_WINSIZE)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/termios.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += termios.h termios.h-t + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/termios-h-c++-tests b/modules/termios-h-c++-tests new file mode 100644 index 0000000000..5eb47cf3ba --- /dev/null +++ b/modules/termios-h-c++-tests @@ -0,0 +1,18 @@ +Files: +tests/test-termios-h-c++.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-termios-h-c++ +check_PROGRAMS += test-termios-h-c++ +test_termios_h_c___SOURCES = test-termios-h-c++.cc +endif diff --git a/modules/termios-h-tests b/modules/termios-h-tests new file mode 100644 index 0000000000..3b64db45d4 --- /dev/null +++ b/modules/termios-h-tests @@ -0,0 +1,11 @@ +Files: +tests/test-termios-h.c + +Depends-on: +termios-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-termios-h +check_PROGRAMS += test-termios-h diff --git a/modules/termios-tests b/modules/termios-tests deleted file mode 100644 index df7eac1900..0000000000 --- a/modules/termios-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-termios.c - -Depends-on: -termios-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-termios -check_PROGRAMS += test-termios diff --git a/tests/test-termios-c++.cc b/tests/test-termios-h-c++.cc similarity index 100% rename from tests/test-termios-c++.cc rename to tests/test-termios-h-c++.cc diff --git a/tests/test-termios.c b/tests/test-termios-h.c similarity index 100% rename from tests/test-termios.c rename to tests/test-termios-h.c