From 95e1b7bdbfc6111b5aea7a32aa874ec0f4af7f86 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 12 Jul 2011 11:34:36 +0200 Subject: [PATCH] Rename module 'arg-nonnull' to 'snippet/arg-nonnull'. * modules/snippet/arg-nonnull: Renamed from modules/arg-nonnull. (Files, Makefile.am): Update. * build-aux/snippet/arg-nonnull.h: Renamed from build-aux/arg-nonnull.h. * modules/argv-iter (Depends-on): Update. * modules/arpa_inet (Depends-on): Update. * modules/dirent (Depends-on): Update. * modules/fcntl-h (Depends-on): Update. * modules/fnmatch (Depends-on): Update. * modules/getopt-posix (Depends-on): Update. * modules/glob (Depends-on): Update. * modules/iconv-h (Depends-on): Update. * modules/inttypes-incomplete (Depends-on): Update. * modules/locale (Depends-on): Update. * modules/math (Depends-on): Update. * modules/netdb (Depends-on): Update. * modules/search (Depends-on): Update. * modules/signal (Depends-on): Update. * modules/spawn (Depends-on): Update. * modules/stdio (Depends-on): Update. * modules/stdlib (Depends-on): Update. * modules/string (Depends-on): Update. * modules/strings (Depends-on): Update. * modules/sys_socket (Depends-on): Update. * modules/sys_stat (Depends-on): Update. * modules/sys_time (Depends-on): Update. * modules/sys_times (Depends-on): Update. * modules/sys_utsname (Depends-on): Update. * modules/time (Depends-on): Update. * modules/unistd (Depends-on): Update. * modules/wchar (Depends-on): Update. * MODULES.html.sh (Support for building libraries and executables): Update. --- ChangeLog | 36 +++++++++++++++++++++++++++ MODULES.html.sh | 2 +- build-aux/{ => snippet}/arg-nonnull.h | 0 modules/argv-iter | 2 +- modules/arpa_inet | 2 +- modules/dirent | 2 +- modules/fcntl-h | 2 +- modules/fnmatch | 2 +- modules/getopt-posix | 2 +- modules/glob | 2 +- modules/iconv-h | 2 +- modules/inttypes-incomplete | 2 +- modules/locale | 2 +- modules/math | 2 +- modules/netdb | 2 +- modules/pselect | 2 +- modules/pselect-tests | 2 +- modules/search | 2 +- modules/signal | 2 +- modules/{ => snippet}/arg-nonnull | 9 ++++--- modules/spawn | 2 +- modules/stdio | 2 +- modules/stdlib | 2 +- modules/string | 2 +- modules/strings | 2 +- modules/sys_socket | 2 +- modules/sys_stat | 2 +- modules/sys_time | 2 +- modules/sys_times | 2 +- modules/sys_utsname | 2 +- modules/time | 2 +- modules/unistd | 2 +- modules/wchar | 2 +- 33 files changed, 71 insertions(+), 34 deletions(-) rename build-aux/{ => snippet}/arg-nonnull.h (100%) rename modules/{ => snippet}/arg-nonnull (76%) diff --git a/ChangeLog b/ChangeLog index 0f8a15abfc..e3009770e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2011-07-12 Bruno Haible + + Rename module 'arg-nonnull' to 'snippet/arg-nonnull'. + * modules/snippet/arg-nonnull: Renamed from modules/arg-nonnull. + (Files, Makefile.am): Update. + * build-aux/snippet/arg-nonnull.h: Renamed from build-aux/arg-nonnull.h. + * modules/argv-iter (Depends-on): Update. + * modules/arpa_inet (Depends-on): Update. + * modules/dirent (Depends-on): Update. + * modules/fcntl-h (Depends-on): Update. + * modules/fnmatch (Depends-on): Update. + * modules/getopt-posix (Depends-on): Update. + * modules/glob (Depends-on): Update. + * modules/iconv-h (Depends-on): Update. + * modules/inttypes-incomplete (Depends-on): Update. + * modules/locale (Depends-on): Update. + * modules/math (Depends-on): Update. + * modules/netdb (Depends-on): Update. + * modules/search (Depends-on): Update. + * modules/signal (Depends-on): Update. + * modules/spawn (Depends-on): Update. + * modules/stdio (Depends-on): Update. + * modules/stdlib (Depends-on): Update. + * modules/string (Depends-on): Update. + * modules/strings (Depends-on): Update. + * modules/sys_socket (Depends-on): Update. + * modules/sys_stat (Depends-on): Update. + * modules/sys_time (Depends-on): Update. + * modules/sys_times (Depends-on): Update. + * modules/sys_utsname (Depends-on): Update. + * modules/time (Depends-on): Update. + * modules/unistd (Depends-on): Update. + * modules/wchar (Depends-on): Update. + * MODULES.html.sh (Support for building libraries and executables): + Update. + 2011-07-12 Paul Eggert Improvements on _Noreturn and related modules. diff --git a/MODULES.html.sh b/MODULES.html.sh index 464f1d8920..e5c476ae45 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -3439,7 +3439,7 @@ func_all_modules () func_begin_table func_module absolute-header - func_module arg-nonnull + func_module snippet/arg-nonnull func_module config-h func_module configmake func_module dummy diff --git a/build-aux/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h similarity index 100% rename from build-aux/arg-nonnull.h rename to build-aux/snippet/arg-nonnull.h diff --git a/modules/argv-iter b/modules/argv-iter index 3844b8a807..8802e8f840 100644 --- a/modules/argv-iter +++ b/modules/argv-iter @@ -6,8 +6,8 @@ lib/argv-iter.c lib/argv-iter.h Depends-on: -arg-nonnull getdelim +snippet/arg-nonnull stdbool configure.ac: diff --git a/modules/arpa_inet b/modules/arpa_inet index 73eb9895b9..0be145ef2c 100644 --- a/modules/arpa_inet +++ b/modules/arpa_inet @@ -6,9 +6,9 @@ lib/arpa_inet.in.h m4/arpa_inet_h.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull sys_socket warn-on-use diff --git a/modules/dirent b/modules/dirent index 9dd4514682..52969d71b1 100644 --- a/modules/dirent +++ b/modules/dirent @@ -7,9 +7,9 @@ m4/dirent_h.m4 m4/unistd_h.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/fcntl-h b/modules/fcntl-h index 42a9147c92..cb7f947ff3 100644 --- a/modules/fcntl-h +++ b/modules/fcntl-h @@ -7,10 +7,10 @@ m4/fcntl_h.m4 m4/fcntl-o.m4 Depends-on: -arg-nonnull c++defs extensions include_next +snippet/arg-nonnull unistd warn-on-use diff --git a/modules/fnmatch b/modules/fnmatch index 8a46af2a7f..a5a49f9d92 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -9,8 +9,8 @@ m4/mbstate_t.m4 m4/fnmatch.m4 Depends-on: -arg-nonnull extensions +snippet/arg-nonnull alloca [test -n "$FNMATCH_H"] stdbool [test -n "$FNMATCH_H"] wchar [test -n "$FNMATCH_H"] diff --git a/modules/getopt-posix b/modules/getopt-posix index 5da0b472ea..89b7a542db 100644 --- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -12,7 +12,7 @@ Depends-on: unistd extensions include_next -arg-nonnull +snippet/arg-nonnull gettext-h [test $REPLACE_GETOPT = 1] configure.ac: diff --git a/modules/glob b/modules/glob index 2abadc09b8..02b02829a9 100644 --- a/modules/glob +++ b/modules/glob @@ -9,9 +9,9 @@ lib/glob.c m4/glob.m4 Depends-on: -arg-nonnull c++defs extensions +snippet/arg-nonnull warn-on-use alloca [test -n "$GLOB_H"] d-type [test -n "$GLOB_H"] diff --git a/modules/iconv-h b/modules/iconv-h index 299cf6e0a9..8984d304e4 100644 --- a/modules/iconv-h +++ b/modules/iconv-h @@ -8,7 +8,7 @@ m4/iconv_h.m4 Depends-on: include_next c++defs -arg-nonnull +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete index ef743dd604..628a068164 100644 --- a/modules/inttypes-incomplete +++ b/modules/inttypes-incomplete @@ -6,9 +6,9 @@ lib/inttypes.in.h m4/inttypes.m4 Depends-on: -arg-nonnull include_next multiarch +snippet/arg-nonnull stdint warn-on-use diff --git a/modules/locale b/modules/locale index a24b3706d9..70e5e286e5 100644 --- a/modules/locale +++ b/modules/locale @@ -6,10 +6,10 @@ lib/locale.in.h m4/locale_h.m4 Depends-on: -arg-nonnull c++defs extensions include_next +snippet/arg-nonnull stddef warn-on-use diff --git a/modules/math b/modules/math index 04d05f6fe1..b4ea6fbbae 100644 --- a/modules/math +++ b/modules/math @@ -6,9 +6,9 @@ lib/math.in.h m4/math_h.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/netdb b/modules/netdb index 9540601691..5e3dee5668 100644 --- a/modules/netdb +++ b/modules/netdb @@ -8,7 +8,7 @@ m4/netdb_h.m4 Depends-on: c++defs include_next -arg-nonnull +snippet/arg-nonnull warn-on-use sys_socket diff --git a/modules/pselect b/modules/pselect index 73c1e9f58e..fa69c5369b 100644 --- a/modules/pselect +++ b/modules/pselect @@ -23,7 +23,7 @@ Include: Link: -$(LIBSOCKET) +$(LIBSOCKET) $(LIB_PTHREAD_SIGMASK) License: LGPLv2+ diff --git a/modules/pselect-tests b/modules/pselect-tests index 0a405fcb68..a5fd9ff08b 100644 --- a/modules/pselect-tests +++ b/modules/pselect-tests @@ -9,4 +9,4 @@ configure.ac: Makefile.am: TESTS += test-pselect check_PROGRAMS += test-pselect -test_pselect_LDADD = $(LDADD) @LIBSOCKET@ $(INET_PTON_LIB) +test_pselect_LDADD = $(LDADD) @LIBSOCKET@ @LIB_PTHREAD_SIGMASK@ $(INET_PTON_LIB) diff --git a/modules/search b/modules/search index 16de9ea694..e4e064efa7 100644 --- a/modules/search +++ b/modules/search @@ -6,9 +6,9 @@ lib/search.in.h m4/search_h.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/signal b/modules/signal index 785da7892e..d70302e9d8 100644 --- a/modules/signal +++ b/modules/signal @@ -6,9 +6,9 @@ lib/signal.in.h m4/signal_h.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull warn-on-use extensions diff --git a/modules/arg-nonnull b/modules/snippet/arg-nonnull similarity index 76% rename from modules/arg-nonnull rename to modules/snippet/arg-nonnull index d4e4d13663..a85a5e28c2 100644 --- a/modules/arg-nonnull +++ b/modules/snippet/arg-nonnull @@ -5,7 +5,7 @@ Applicability: all Files: -build-aux/arg-nonnull.h +build-aux/snippet/arg-nonnull.h Depends-on: @@ -19,11 +19,12 @@ Makefile.am: BUILT_SOURCES += arg-nonnull.h # The arg-nonnull.h that gets inserted into generated .h files is the same as -# build-aux/arg-nonnull.h, except that it has the copyright header cut off. -arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h +# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +# off. +arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h $(AM_V_GEN)rm -f $@-t $@ && \ sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/arg-nonnull.h \ + < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ > $@-t && \ mv $@-t $@ MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t diff --git a/modules/spawn b/modules/spawn index 718a61eaa4..650d260d4c 100644 --- a/modules/spawn +++ b/modules/spawn @@ -6,10 +6,10 @@ lib/spawn.in.h m4/spawn_h.m4 Depends-on: -arg-nonnull c++defs include_next sched +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/stdio b/modules/stdio index c524d73202..fdae894985 100644 --- a/modules/stdio +++ b/modules/stdio @@ -7,8 +7,8 @@ m4/stdio_h.m4 Depends-on: include_next -arg-nonnull c++defs +snippet/arg-nonnull stddef warn-on-use diff --git a/modules/stdlib b/modules/stdlib index 0ec07fb557..c0497637f0 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -7,9 +7,9 @@ m4/stdlib_h.m4 Depends-on: _Noreturn -arg-nonnull c++defs include_next +snippet/arg-nonnull stddef unistd warn-on-use diff --git a/modules/string b/modules/string index 62f2634dd0..f457ab13fe 100644 --- a/modules/string +++ b/modules/string @@ -6,10 +6,10 @@ lib/string.in.h m4/string_h.m4 Depends-on: -arg-nonnull c++defs extensions include_next +snippet/arg-nonnull stddef warn-on-use diff --git a/modules/strings b/modules/strings index 87bccc46cb..3c4de9051f 100644 --- a/modules/strings +++ b/modules/strings @@ -6,9 +6,9 @@ lib/strings.in.h m4/strings_h.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/sys_socket b/modules/sys_socket index e76bcee01a..b78e782558 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -8,10 +8,10 @@ m4/sockpfaf.m4 Depends-on: alignof -arg-nonnull c++defs errno include_next +snippet/arg-nonnull socklen sys_uio warn-on-use diff --git a/modules/sys_stat b/modules/sys_stat index b6461888b0..baa531b68b 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -7,9 +7,9 @@ m4/sys_stat_h.m4 m4/unistd_h.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull time warn-on-use diff --git a/modules/sys_time b/modules/sys_time index 6e2b33a197..ca5862d4e9 100644 --- a/modules/sys_time +++ b/modules/sys_time @@ -7,8 +7,8 @@ m4/sys_time_h.m4 Depends-on: include_next -arg-nonnull c++defs +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/sys_times b/modules/sys_times index 936d320b3d..5d289d1349 100644 --- a/modules/sys_times +++ b/modules/sys_times @@ -6,8 +6,8 @@ lib/sys_times.in.h m4/sys_times_h.m4 Depends-on: -arg-nonnull include_next +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/sys_utsname b/modules/sys_utsname index 4d30baa3e3..8e6ed6aaf4 100644 --- a/modules/sys_utsname +++ b/modules/sys_utsname @@ -6,8 +6,8 @@ lib/sys_utsname.in.h m4/sys_utsname_h.m4 Depends-on: -arg-nonnull include_next +snippet/arg-nonnull warn-on-use configure.ac: diff --git a/modules/time b/modules/time index 46a1e10893..4af57fd118 100644 --- a/modules/time +++ b/modules/time @@ -8,8 +8,8 @@ m4/time_h.m4 Depends-on: extensions include_next -arg-nonnull c++defs +snippet/arg-nonnull warn-on-use stddef diff --git a/modules/unistd b/modules/unistd index 1849de8554..48c7c047aa 100644 --- a/modules/unistd +++ b/modules/unistd @@ -6,9 +6,9 @@ m4/unistd_h.m4 lib/unistd.in.h Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull stddef warn-on-use diff --git a/modules/wchar b/modules/wchar index 1e96e2ffa1..6efec9f45c 100644 --- a/modules/wchar +++ b/modules/wchar @@ -7,9 +7,9 @@ m4/wchar_h.m4 m4/wint_t.m4 Depends-on: -arg-nonnull c++defs include_next +snippet/arg-nonnull stddef warn-on-use -- 2.30.2