From: Jim Meyering Date: Wed, 2 Apr 2008 06:32:17 +0000 (+0200) Subject: bootstrap: remove dangling *.[ch] symlinks from lib X-Git-Tag: v0.1~7610 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=8bd046aa8cf6698d81bb5cdc283e5de05e8b68c9;p=gnulib.git bootstrap: remove dangling *.[ch] symlinks from lib * build-aux/bootstrap [dangling symlink removal]: Move find's -depth option to precede all others, to avoid a warning. Remove *.[ch] files too, and from "$source_base" (usually lib/). --- diff --git a/ChangeLog b/ChangeLog index 0fae6b5b6..6f82cdc91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-03 Jim Meyering + + bootstrap: remove dangling *.[ch] symlinks from lib + * build-aux/bootstrap [dangling symlink removal]: Move find's + -depth option to precede all others, to avoid a warning. + Remove *.[ch] files too, and from "$source_base" (usually lib/). + 2008-04-02 Bruno Haible Avoid some warnings from "gcc -Wshadow". diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 1c90df7cb..9a8576201 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -548,15 +548,17 @@ if test -f $mam_template; then done fi -# Remove any dangling symlink matching "*.m4" in the gnulib-populated -# $m4_base directory, since such a file would cause aclocal to fail. +# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some +# gnulib-populated directories. Such .m4 files would cause aclocal to fail. # The following requires GNU find 4.2.3 or newer. Considering the usual # portability constraints of this script, that may seem a very demanding # requirement, but it should be ok. Ignore any failure, which is fine, # since this is only a convenience to help developers avoid the relatively # unusual case in which a symlinked-to .m4 file is git-removed from gnulib # between successive runs of this script. -find "$m4_base" -name '*.m4' -depth -type l -xtype l -delete > /dev/null 2>&1 +find "$m4_base" "$source_base" \ + -depth \( -name '*.m4' -o -name '*.[ch]' \) \ + -type l -xtype l -delete > /dev/null 2>&1 # Reconfigure, getting other files.