From: Bruno Haible Date: Fri, 27 Dec 2024 22:39:46 +0000 (+0100) Subject: Rename module sysexits to sysexits-h. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b845b0cb6103c6156489fd8bbf3cf7293f653399;p=thirdparty%2Fgnulib.git Rename module sysexits to sysexits-h. * modules/sysexits-h: Renamed from modules/sysexits. * modules/sysexits-h-tests: Renamed from modules/sysexits-tests. * modules/sysexits-h-c++-tests: Renamed from modules/sysexits-c++-tests. * tests/test-sysexits-h.c: Renamed from tests/test-sysexits.c. * tests/test-sysexits-h-c++.cc: Renamed from tests/test-sysexits-c++.cc. * doc/glibc-headers/sysexits.texi: Update. * modules/* (Depends-on): Update. * modules/sysexits: New file. --- diff --git a/ChangeLog b/ChangeLog index 57d7d1e99f..f28bf8e63f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2024-12-27 Bruno Haible + + Rename module sysexits to sysexits-h. + * modules/sysexits-h: Renamed from modules/sysexits. + * modules/sysexits-h-tests: Renamed from modules/sysexits-tests. + * modules/sysexits-h-c++-tests: Renamed from modules/sysexits-c++-tests. + * tests/test-sysexits-h.c: Renamed from tests/test-sysexits.c. + * tests/test-sysexits-h-c++.cc: Renamed from tests/test-sysexits-c++.cc. + * doc/glibc-headers/sysexits.texi: Update. + * modules/* (Depends-on): Update. + * modules/sysexits: New file. + 2024-12-27 Bruno Haible Rename module strings to strings-h. diff --git a/doc/glibc-headers/sysexits.texi b/doc/glibc-headers/sysexits.texi index b3cbbc80c7..22b3201d69 100644 --- a/doc/glibc-headers/sysexits.texi +++ b/doc/glibc-headers/sysexits.texi @@ -3,8 +3,8 @@ Defines the @code{EX_*} macros, including @code{EX_OK}. -Gnulib module: sysexits -@mindex sysexits +Gnulib module: sysexits-h +@mindex sysexits-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/argp b/modules/argp index a4b0183a87..87da44c85c 100644 --- a/modules/argp +++ b/modules/argp @@ -24,7 +24,7 @@ basename-lgpl extern-inline getopt-gnu strchrnul -sysexits +sysexits-h malloc-gnu mempcpy strndup diff --git a/modules/sysexits b/modules/sysexits index 384c9a2308..65219e7244 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -1,42 +1,20 @@ Description: Exit status codes for some BSD system programs. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'sysexits-h' instead. + Files: -lib/sysexits.in.h -m4/sysexits.m4 Depends-on: -gen-header -include_next -stdlib-h +sysexits-h configure.ac: -gl_SYSEXITS -gl_CONDITIONAL_HEADER([sysexits.h]) -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += $(SYSEXITS_H) - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -if GL_GENERATE_SYSEXITS_H -sysexits.h: sysexits.in.h $(top_builddir)/config.status -@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_SYSEXITS_H''@|$(HAVE_SYSEXITS_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_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \ - $(srcdir)/sysexits.in.h > $@-t - $(AM_V_at)mv $@-t $@ -else -sysexits.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += sysexits.h sysexits.h-t Include: @@ -45,4 +23,3 @@ License: LGPLv2+ Maintainer: -Simon Josefsson diff --git a/modules/sysexits-c++-tests b/modules/sysexits-c++-tests deleted file mode 100644 index e937d82017..0000000000 --- a/modules/sysexits-c++-tests +++ /dev/null @@ -1,17 +0,0 @@ -Files: -tests/test-sysexits-c++.cc - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-sysexits-c++ -check_PROGRAMS += test-sysexits-c++ -test_sysexits_c___SOURCES = test-sysexits-c++.cc -endif diff --git a/modules/sysexits-h b/modules/sysexits-h new file mode 100644 index 0000000000..384c9a2308 --- /dev/null +++ b/modules/sysexits-h @@ -0,0 +1,48 @@ +Description: +Exit status codes for some BSD system programs. + +Files: +lib/sysexits.in.h +m4/sysexits.m4 + +Depends-on: +gen-header +include_next +stdlib-h + +configure.ac: +gl_SYSEXITS +gl_CONDITIONAL_HEADER([sysexits.h]) +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += $(SYSEXITS_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_SYSEXITS_H +sysexits.h: sysexits.in.h $(top_builddir)/config.status +@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_SYSEXITS_H''@|$(HAVE_SYSEXITS_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_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \ + $(srcdir)/sysexits.in.h > $@-t + $(AM_V_at)mv $@-t $@ +else +sysexits.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += sysexits.h sysexits.h-t + +Include: + + +License: +LGPLv2+ + +Maintainer: +Simon Josefsson diff --git a/modules/sysexits-h-c++-tests b/modules/sysexits-h-c++-tests new file mode 100644 index 0000000000..6b57e7049b --- /dev/null +++ b/modules/sysexits-h-c++-tests @@ -0,0 +1,17 @@ +Files: +tests/test-sysexits-h-c++.cc + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-sysexits-h-c++ +check_PROGRAMS += test-sysexits-h-c++ +test_sysexits_h_c___SOURCES = test-sysexits-h-c++.cc +endif diff --git a/modules/sysexits-h-tests b/modules/sysexits-h-tests new file mode 100644 index 0000000000..05d47c25db --- /dev/null +++ b/modules/sysexits-h-tests @@ -0,0 +1,11 @@ +Files: +tests/test-sysexits-h.c + +Depends-on: +sysexits-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-sysexits-h +check_PROGRAMS += test-sysexits-h diff --git a/modules/sysexits-tests b/modules/sysexits-tests deleted file mode 100644 index e8de13a1c2..0000000000 --- a/modules/sysexits-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-sysexits.c - -Depends-on: -sysexits-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-sysexits -check_PROGRAMS += test-sysexits diff --git a/tests/test-sysexits-c++.cc b/tests/test-sysexits-h-c++.cc similarity index 100% rename from tests/test-sysexits-c++.cc rename to tests/test-sysexits-h-c++.cc diff --git a/tests/test-sysexits.c b/tests/test-sysexits-h.c similarity index 100% rename from tests/test-sysexits.c rename to tests/test-sysexits-h.c