From 204dfab7318455ac1f900d3f2202e7cf64569544 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Dec 2024 23:14:32 +0100 Subject: [PATCH] Rename module net_if to net_if-h. * modules/net_if-h: Renamed from modules/net_if. * modules/net_if-h-tests: Renamed from modules/net_if-tests. * modules/net_if-h-c++-tests: Renamed from modules/net_if-c++-tests. * tests/test-net_if-h.c: Renamed from tests/test-net_if.c. * tests/test-net_if-h-c++.cc: Renamed from tests/test-net_if-c++.cc. * doc/posix-headers/net_if.texi: Update. * modules/net_if: New file. --- ChangeLog | 11 +++++ doc/posix-headers/net_if.texi | 4 +- modules/net_if | 38 +++----------- modules/net_if-c++-tests | 19 ------- modules/net_if-h | 49 +++++++++++++++++++ modules/net_if-h-c++-tests | 19 +++++++ modules/{net_if-tests => net_if-h-tests} | 10 ++-- ...est-net_if-c++.cc => test-net_if-h-c++.cc} | 0 tests/{test-net_if.c => test-net_if-h.c} | 0 9 files changed, 93 insertions(+), 57 deletions(-) delete mode 100644 modules/net_if-c++-tests create mode 100644 modules/net_if-h create mode 100644 modules/net_if-h-c++-tests rename modules/{net_if-tests => net_if-h-tests} (73%) rename tests/{test-net_if-c++.cc => test-net_if-h-c++.cc} (100%) rename tests/{test-net_if.c => test-net_if-h.c} (100%) diff --git a/ChangeLog b/ChangeLog index 12ae4c74bc..a47950f80e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2024-12-27 Bruno Haible + + Rename module net_if to net_if-h. + * modules/net_if-h: Renamed from modules/net_if. + * modules/net_if-h-tests: Renamed from modules/net_if-tests. + * modules/net_if-h-c++-tests: Renamed from modules/net_if-c++-tests. + * tests/test-net_if-h.c: Renamed from tests/test-net_if.c. + * tests/test-net_if-h-c++.cc: Renamed from tests/test-net_if-c++.cc. + * doc/posix-headers/net_if.texi: Update. + * modules/net_if: New file. + 2024-12-27 Bruno Haible Rename module netdb to netdb-h. diff --git a/doc/posix-headers/net_if.texi b/doc/posix-headers/net_if.texi index 644b06abd5..f38c7f7394 100644 --- a/doc/posix-headers/net_if.texi +++ b/doc/posix-headers/net_if.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/net_if.h.html} -Gnulib module: net_if -@mindex net_if +Gnulib module: net_if-h +@mindex net_if-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/net_if b/modules/net_if index d1b4865bdb..efecbdfab8 100644 --- a/modules/net_if +++ b/modules/net_if @@ -1,43 +1,20 @@ Description: A for systems lacking it. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'net_if-h' instead. + Files: -lib/net_if.in.h -m4/net_if_h.m4 Depends-on: -gen-header -include_next -sys_socket +net_if-h configure.ac: -gl_HEADER_NET_IF -gl_CONDITIONAL_HEADER([net/if.h]) -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += $(NET_IF_H) - -# We need the following in order to create when the system -# doesn't have one. -if GL_GENERATE_NET_IF_H -net/if.h: net_if.in.h $(top_builddir)/config.status - $(AM_V_GEN)$(MKDIR_P) '%reldir%/net' - $(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_NET_IF_H''@|$(NEXT_NET_IF_H)|g' \ - -e 's|@''HAVE_NET_IF_H''@|$(HAVE_NET_IF_H)|g' \ - $(srcdir)/net_if.in.h > $@-t - $(AM_V_at)mv $@-t $@ -else -net/if.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += net/if.h net/if.h-t -MOSTLYCLEANDIRS += net Include: @@ -46,4 +23,3 @@ License: LGPLv2+ Maintainer: -Eric Blake diff --git a/modules/net_if-c++-tests b/modules/net_if-c++-tests deleted file mode 100644 index 211169674b..0000000000 --- a/modules/net_if-c++-tests +++ /dev/null @@ -1,19 +0,0 @@ -Files: -tests/test-net_if-c++.cc - -Status: -c++-test - -Depends-on: -ansi-c++-opt -net_if-tests - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-net_if-c++ -check_PROGRAMS += test-net_if-c++ -test_net_if_c___SOURCES = test-net_if-c++.cc -test_net_if_c___LDADD = $(LDADD) @NET_IF_LIB@ -endif diff --git a/modules/net_if-h b/modules/net_if-h new file mode 100644 index 0000000000..d1b4865bdb --- /dev/null +++ b/modules/net_if-h @@ -0,0 +1,49 @@ +Description: +A for systems lacking it. + +Files: +lib/net_if.in.h +m4/net_if_h.m4 + +Depends-on: +gen-header +include_next +sys_socket + +configure.ac: +gl_HEADER_NET_IF +gl_CONDITIONAL_HEADER([net/if.h]) +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += $(NET_IF_H) + +# We need the following in order to create when the system +# doesn't have one. +if GL_GENERATE_NET_IF_H +net/if.h: net_if.in.h $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) '%reldir%/net' + $(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_NET_IF_H''@|$(NEXT_NET_IF_H)|g' \ + -e 's|@''HAVE_NET_IF_H''@|$(HAVE_NET_IF_H)|g' \ + $(srcdir)/net_if.in.h > $@-t + $(AM_V_at)mv $@-t $@ +else +net/if.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += net/if.h net/if.h-t +MOSTLYCLEANDIRS += net + +Include: + + +License: +LGPLv2+ + +Maintainer: +Eric Blake diff --git a/modules/net_if-h-c++-tests b/modules/net_if-h-c++-tests new file mode 100644 index 0000000000..8a86ea4f50 --- /dev/null +++ b/modules/net_if-h-c++-tests @@ -0,0 +1,19 @@ +Files: +tests/test-net_if-h-c++.cc + +Status: +c++-test + +Depends-on: +ansi-c++-opt +net_if-h-tests + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-net_if-h-c++ +check_PROGRAMS += test-net_if-h-c++ +test_net_if_h_c___SOURCES = test-net_if-h-c++.cc +test_net_if_h_c___LDADD = $(LDADD) @NET_IF_LIB@ +endif diff --git a/modules/net_if-tests b/modules/net_if-h-tests similarity index 73% rename from modules/net_if-tests rename to modules/net_if-h-tests index 116bf62ea6..be2709c707 100644 --- a/modules/net_if-tests +++ b/modules/net_if-h-tests @@ -1,9 +1,9 @@ Files: -tests/test-net_if.c +tests/test-net_if-h.c tests/signature.h Depends-on: -net_if-c++-tests +net_if-h-c++-tests configure.ac: NET_IF_LIB= @@ -17,6 +17,6 @@ LIBS="$gl_saved_libs" AC_SUBST([NET_IF_LIB]) Makefile.am: -TESTS += test-net_if -check_PROGRAMS += test-net_if -test_net_if_LDADD = $(LDADD) @NET_IF_LIB@ +TESTS += test-net_if-h +check_PROGRAMS += test-net_if-h +test_net_if_h_LDADD = $(LDADD) @NET_IF_LIB@ diff --git a/tests/test-net_if-c++.cc b/tests/test-net_if-h-c++.cc similarity index 100% rename from tests/test-net_if-c++.cc rename to tests/test-net_if-h-c++.cc diff --git a/tests/test-net_if.c b/tests/test-net_if-h.c similarity index 100% rename from tests/test-net_if.c rename to tests/test-net_if-h.c -- 2.39.5