From 6045c2ba7c6a9fb040d41abd78765bfad437a08f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 12 Jul 2011 11:39:50 +0200 Subject: [PATCH] Rename module 'c++defs' to 'snippet/c++defs'. * modules/snippet/c++defs: Renamed from modules/c++defs. (Files, Makefile.am): Update. * build-aux/snippet/c++defs.h: Renamed from build-aux/c++defs.h. * modules/arpa_inet (Depends-on): Update. * modules/ctype (Depends-on): Update. * modules/dirent (Depends-on): Update. * modules/fcntl-h (Depends-on): Update. * modules/glob (Depends-on): Update. * modules/iconv-h (Depends-on): Update. * modules/langinfo (Depends-on): Update. * modules/locale (Depends-on): Update. * modules/math (Depends-on): Update. * modules/netdb (Depends-on): Update. * modules/poll-h (Depends-on): Update. * modules/pty (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_ioctl (Depends-on): Update. * modules/sys_select (Depends-on): Update. * modules/sys_socket (Depends-on): Update. * modules/sys_stat (Depends-on): Update. * modules/sys_time (Depends-on): Update. * modules/sys_wait (Depends-on): Update. * modules/termios (Depends-on): Update. * modules/time (Depends-on): Update. * modules/unistd (Depends-on): Update. * modules/wchar (Depends-on): Update. * modules/wctype-h (Depends-on): Update. --- ChangeLog | 35 +++++++++++++++++++++++++++++++ build-aux/{ => snippet}/c++defs.h | 0 modules/arpa_inet | 2 +- modules/ctype | 2 +- modules/dirent | 2 +- modules/fcntl-h | 2 +- modules/glob | 2 +- modules/iconv-h | 2 +- modules/langinfo | 2 +- modules/locale | 2 +- modules/math | 2 +- modules/netdb | 2 +- modules/poll-h | 2 +- modules/pty | 2 +- modules/search | 2 +- modules/signal | 2 +- modules/{ => snippet}/c++defs | 8 +++---- modules/spawn | 2 +- modules/stdio | 2 +- modules/stdlib | 2 +- modules/string | 2 +- modules/strings | 2 +- modules/sys_ioctl | 2 +- modules/sys_select | 2 +- modules/sys_socket | 2 +- modules/sys_stat | 2 +- modules/sys_time | 2 +- modules/sys_wait | 2 +- modules/termios | 2 +- modules/time | 2 +- modules/unistd | 2 +- modules/wchar | 2 +- modules/wctype-h | 2 +- 33 files changed, 69 insertions(+), 34 deletions(-) rename build-aux/{ => snippet}/c++defs.h (100%) rename modules/{ => snippet}/c++defs (76%) diff --git a/ChangeLog b/ChangeLog index e3009770e4..c5f54ae383 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,40 @@ 2011-07-12 Bruno Haible + Rename module 'c++defs' to 'snippet/c++defs'. + * modules/snippet/c++defs: Renamed from modules/c++defs. + (Files, Makefile.am): Update. + * build-aux/snippet/c++defs.h: Renamed from build-aux/c++defs.h. + * modules/arpa_inet (Depends-on): Update. + * modules/ctype (Depends-on): Update. + * modules/dirent (Depends-on): Update. + * modules/fcntl-h (Depends-on): Update. + * modules/glob (Depends-on): Update. + * modules/iconv-h (Depends-on): Update. + * modules/langinfo (Depends-on): Update. + * modules/locale (Depends-on): Update. + * modules/math (Depends-on): Update. + * modules/netdb (Depends-on): Update. + * modules/poll-h (Depends-on): Update. + * modules/pty (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_ioctl (Depends-on): Update. + * modules/sys_select (Depends-on): Update. + * modules/sys_socket (Depends-on): Update. + * modules/sys_stat (Depends-on): Update. + * modules/sys_time (Depends-on): Update. + * modules/sys_wait (Depends-on): Update. + * modules/termios (Depends-on): Update. + * modules/time (Depends-on): Update. + * modules/unistd (Depends-on): Update. + * modules/wchar (Depends-on): Update. + * modules/wctype-h (Depends-on): Update. + Rename module 'arg-nonnull' to 'snippet/arg-nonnull'. * modules/snippet/arg-nonnull: Renamed from modules/arg-nonnull. (Files, Makefile.am): Update. diff --git a/build-aux/c++defs.h b/build-aux/snippet/c++defs.h similarity index 100% rename from build-aux/c++defs.h rename to build-aux/snippet/c++defs.h diff --git a/modules/arpa_inet b/modules/arpa_inet index 0be145ef2c..6fd3bd917c 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: -c++defs include_next snippet/arg-nonnull +snippet/c++defs sys_socket warn-on-use diff --git a/modules/ctype b/modules/ctype index 277c1e4a96..fbbc541b22 100644 --- a/modules/ctype +++ b/modules/ctype @@ -7,7 +7,7 @@ m4/ctype.m4 Depends-on: include_next -c++defs +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/dirent b/modules/dirent index 52969d71b1..e7e7b9b353 100644 --- a/modules/dirent +++ b/modules/dirent @@ -7,9 +7,9 @@ m4/dirent_h.m4 m4/unistd_h.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/fcntl-h b/modules/fcntl-h index cb7f947ff3..d3531e99b6 100644 --- a/modules/fcntl-h +++ b/modules/fcntl-h @@ -7,10 +7,10 @@ m4/fcntl_h.m4 m4/fcntl-o.m4 Depends-on: -c++defs extensions include_next snippet/arg-nonnull +snippet/c++defs unistd warn-on-use diff --git a/modules/glob b/modules/glob index 02b02829a9..2f67794eda 100644 --- a/modules/glob +++ b/modules/glob @@ -9,9 +9,9 @@ lib/glob.c m4/glob.m4 Depends-on: -c++defs extensions snippet/arg-nonnull +snippet/c++defs 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 8984d304e4..7240784f0b 100644 --- a/modules/iconv-h +++ b/modules/iconv-h @@ -7,8 +7,8 @@ m4/iconv_h.m4 Depends-on: include_next -c++defs snippet/arg-nonnull +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/langinfo b/modules/langinfo index f76bd657d0..6b5a8725ab 100644 --- a/modules/langinfo +++ b/modules/langinfo @@ -8,7 +8,7 @@ m4/langinfo_h.m4 Depends-on: extensions include_next -c++defs +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/locale b/modules/locale index 70e5e286e5..0aa8925afa 100644 --- a/modules/locale +++ b/modules/locale @@ -6,10 +6,10 @@ lib/locale.in.h m4/locale_h.m4 Depends-on: -c++defs extensions include_next snippet/arg-nonnull +snippet/c++defs stddef warn-on-use diff --git a/modules/math b/modules/math index b4ea6fbbae..4f3f2289cb 100644 --- a/modules/math +++ b/modules/math @@ -6,9 +6,9 @@ lib/math.in.h m4/math_h.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/netdb b/modules/netdb index 5e3dee5668..75cfd8b6c6 100644 --- a/modules/netdb +++ b/modules/netdb @@ -6,9 +6,9 @@ lib/netdb.in.h m4/netdb_h.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs warn-on-use sys_socket diff --git a/modules/poll-h b/modules/poll-h index 8935ae15ff..ab21341d8e 100644 --- a/modules/poll-h +++ b/modules/poll-h @@ -6,9 +6,9 @@ lib/poll.in.h m4/poll_h.m4 Depends-on: -c++defs extensions include_next +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/pty b/modules/pty index dcc7842c5b..beaa1ccd89 100644 --- a/modules/pty +++ b/modules/pty @@ -6,8 +6,8 @@ lib/pty.in.h m4/pty_h.m4 Depends-on: -c++defs include_next +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/search b/modules/search index e4e064efa7..66cd19d0e3 100644 --- a/modules/search +++ b/modules/search @@ -6,9 +6,9 @@ lib/search.in.h m4/search_h.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/signal b/modules/signal index d70302e9d8..2e810ae09b 100644 --- a/modules/signal +++ b/modules/signal @@ -6,9 +6,9 @@ lib/signal.in.h m4/signal_h.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs warn-on-use extensions diff --git a/modules/c++defs b/modules/snippet/c++defs similarity index 76% rename from modules/c++defs rename to modules/snippet/c++defs index 186584f31e..e624bed4d7 100644 --- a/modules/c++defs +++ b/modules/snippet/c++defs @@ -5,7 +5,7 @@ Applicability: all Files: -build-aux/c++defs.h +build-aux/snippet/c++defs.h Depends-on: @@ -19,11 +19,11 @@ Makefile.am: BUILT_SOURCES += c++defs.h # The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/c++defs.h +# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h $(AM_V_GEN)rm -f $@-t $@ && \ sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/c++defs.h \ + < $(top_srcdir)/build-aux/snippet/c++defs.h \ > $@-t && \ mv $@-t $@ MOSTLYCLEANFILES += c++defs.h c++defs.h-t diff --git a/modules/spawn b/modules/spawn index 650d260d4c..12c28abacb 100644 --- a/modules/spawn +++ b/modules/spawn @@ -6,10 +6,10 @@ lib/spawn.in.h m4/spawn_h.m4 Depends-on: -c++defs include_next sched snippet/arg-nonnull +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/stdio b/modules/stdio index fdae894985..75a3c989ac 100644 --- a/modules/stdio +++ b/modules/stdio @@ -7,8 +7,8 @@ m4/stdio_h.m4 Depends-on: include_next -c++defs snippet/arg-nonnull +snippet/c++defs stddef warn-on-use diff --git a/modules/stdlib b/modules/stdlib index c0497637f0..ae51e9fd47 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -7,9 +7,9 @@ m4/stdlib_h.m4 Depends-on: _Noreturn -c++defs include_next snippet/arg-nonnull +snippet/c++defs stddef unistd warn-on-use diff --git a/modules/string b/modules/string index f457ab13fe..afa4f3ca29 100644 --- a/modules/string +++ b/modules/string @@ -6,10 +6,10 @@ lib/string.in.h m4/string_h.m4 Depends-on: -c++defs extensions include_next snippet/arg-nonnull +snippet/c++defs stddef warn-on-use diff --git a/modules/strings b/modules/strings index 3c4de9051f..ef1e13cb60 100644 --- a/modules/strings +++ b/modules/strings @@ -6,9 +6,9 @@ lib/strings.in.h m4/strings_h.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/sys_ioctl b/modules/sys_ioctl index be247f66a9..4fa807ff5b 100644 --- a/modules/sys_ioctl +++ b/modules/sys_ioctl @@ -7,7 +7,7 @@ m4/sys_ioctl_h.m4 Depends-on: include_next -c++defs +snippet/c++defs unistd warn-on-use diff --git a/modules/sys_select b/modules/sys_select index 5af56ddda6..3d579f9ef8 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -8,8 +8,8 @@ m4/sys_socket_h.m4 Depends-on: include_next -c++defs signal +snippet/c++defs sys_time warn-on-use diff --git a/modules/sys_socket b/modules/sys_socket index b78e782558..5bcde53738 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -8,10 +8,10 @@ m4/sockpfaf.m4 Depends-on: alignof -c++defs errno include_next snippet/arg-nonnull +snippet/c++defs socklen sys_uio warn-on-use diff --git a/modules/sys_stat b/modules/sys_stat index baa531b68b..3bb367bf38 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -7,9 +7,9 @@ m4/sys_stat_h.m4 m4/unistd_h.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs time warn-on-use diff --git a/modules/sys_time b/modules/sys_time index ca5862d4e9..1d271bc569 100644 --- a/modules/sys_time +++ b/modules/sys_time @@ -7,8 +7,8 @@ m4/sys_time_h.m4 Depends-on: include_next -c++defs snippet/arg-nonnull +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/sys_wait b/modules/sys_wait index ad3d4407af..2159e55bee 100644 --- a/modules/sys_wait +++ b/modules/sys_wait @@ -6,8 +6,8 @@ lib/sys_wait.in.h m4/sys_wait_h.m4 Depends-on: -c++defs include_next +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/termios b/modules/termios index f747e9234e..60e9b44336 100644 --- a/modules/termios +++ b/modules/termios @@ -7,7 +7,7 @@ m4/termios_h.m4 Depends-on: include_next -c++defs +snippet/c++defs warn-on-use configure.ac: diff --git a/modules/time b/modules/time index 4af57fd118..34d749a7c0 100644 --- a/modules/time +++ b/modules/time @@ -8,8 +8,8 @@ m4/time_h.m4 Depends-on: extensions include_next -c++defs snippet/arg-nonnull +snippet/c++defs warn-on-use stddef diff --git a/modules/unistd b/modules/unistd index 48c7c047aa..fa69a8b7b2 100644 --- a/modules/unistd +++ b/modules/unistd @@ -6,9 +6,9 @@ m4/unistd_h.m4 lib/unistd.in.h Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs stddef warn-on-use diff --git a/modules/wchar b/modules/wchar index 6efec9f45c..04ff3459dc 100644 --- a/modules/wchar +++ b/modules/wchar @@ -7,9 +7,9 @@ m4/wchar_h.m4 m4/wint_t.m4 Depends-on: -c++defs include_next snippet/arg-nonnull +snippet/c++defs stddef warn-on-use diff --git a/modules/wctype-h b/modules/wctype-h index 20f773ec8d..08c66c6c6f 100644 --- a/modules/wctype-h +++ b/modules/wctype-h @@ -8,7 +8,7 @@ m4/wint_t.m4 Depends-on: include_next -c++defs +snippet/c++defs warn-on-use configure.ac: -- 2.30.2