From bece71c9b0a2a226a53c5acca82bac06fd934522 Mon Sep 17 00:00:00 2001 From: James Youngman Date: Sat, 21 Feb 2009 14:55:56 +0000 Subject: [PATCH] Update gnulib version; follow gnulib-tool's Makefile.am edit suggestions. To: address@hidden Update gnulib version. * import-gnulib.config (gpl3_update_files): No longer need to update the licenses of build-aux/mdate-sh, build-aux/texinfo.tex or build-aux/ylwrap as they are already GPLv3+. (modules): Use the strdup-posix module instead of strdup, and stop using the obsolete modules memcmp and memset, since we now assume those functions will already be present on the host system. * import-gnulib.sh (rehack): Be more verbose about which files actually needed a license edit and which did not. Follow gnulib-tool's Makefile.am edit suggestions. * find/Makefile.am (LDADD): Use $(LIBINTL) instead of @INTLLIBS@ and use $(LIB_CLOCK_GETTIME) instead of @address@hidden * lib/Makefile.am: Likewise. * locate/Makefile.am: Likewise. * xargs/Makefile.am: Likewise. * import-gnulib.sh (hack_gnulib_tool_output): Add m4/gnulib-cache.m4 to EXTRA_DIST in gnulib/Makefile.am, as gnulib-tool suggests. --- ChangeLog | 22 ++++++++++++++++++++++ find/Makefile.am | 2 +- import-gnulib.config | 13 +++++-------- import-gnulib.sh | 13 ++++++------- lib/Makefile.am | 2 +- locate/Makefile.am | 2 +- xargs/Makefile.am | 2 +- 7 files changed, 37 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2a9418..17d9eb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2009-02-21 James Youngman + + Update gnulib version. + * import-gnulib.config (gpl3_update_files): No longer need to + update the licenses of build-aux/mdate-sh, build-aux/texinfo.tex + or build-aux/ylwrap as they are already GPLv3+. + (modules): Use the strdup-posix module instead of strdup, and stop + using the obsolete modules memcmp and memset, since we now assume + those functions will already be present on the host system. + * import-gnulib.sh (rehack): Be more verbose about which files + actually needed a license edit and which did not. + + Follow gnulib-tool's Makefile.am edit suggestions. + * find/Makefile.am (LDADD): Use $(LIBINTL) instead of @INTLLIBS@ + and use $(LIB_CLOCK_GETTIME) instead of @address@hidden + * lib/Makefile.am: Likewise. + * locate/Makefile.am: Likewise. + * xargs/Makefile.am: Likewise. + * import-gnulib.sh (hack_gnulib_tool_output): Add + m4/gnulib-cache.m4 to EXTRA_DIST in gnulib/Makefile.am, as + gnulib-tool suggests. + 2009-02-21 Jim Meyering find: avoid warning about unused local, remove unnecessary include. diff --git a/find/Makefile.am b/find/Makefile.am index b001509..39827b4 100644 --- a/find/Makefile.am +++ b/find/Makefile.am @@ -26,7 +26,7 @@ endif EXTRA_DIST = defs.h $(man_MANS) INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" -LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ +LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) @FINDLIBS@ man_MANS = find.1 SUBDIRS = . testsuite diff --git a/import-gnulib.config b/import-gnulib.config index 71c4d66..6ea1d2d 100644 --- a/import-gnulib.config +++ b/import-gnulib.config @@ -16,11 +16,7 @@ build-aux/missing build-aux/texinfo.tex ' -gpl3_update_files=' -build-aux/mdate-sh -build-aux/texinfo.tex -build-aux/ylwrap -' +gpl3_update_files='' # Modules needed for findutils. @@ -56,8 +52,6 @@ lstat malloc mbscasestr mbsstr -memcmp -memset mktime modechange mountlist @@ -72,7 +66,7 @@ stat-macros stat-time stpcpy strcasestr -strdup +strdup-posix strftime strtol strtoul @@ -92,3 +86,6 @@ xstrtol xstrtoumax yesno ' + +# Obsolete modules we've removed. +# memcmp memset diff --git a/import-gnulib.sh b/import-gnulib.sh index 2bc35c0..00db007 100755 --- a/import-gnulib.sh +++ b/import-gnulib.sh @@ -1,7 +1,7 @@ #! /bin/sh # # import-gnulib.sh -- imports a copy of gnulib into findutils -# Copyright (C) 2003,2004,2005,2006,2007 Free Software Foundation, Inc. +# Copyright (C) 2003,2004,2005,2006,2007,2009 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -137,16 +137,18 @@ run_gnulib_tool() { } rehack() { - echo "Updating the license of $1" + printf "Updating the license of $1... " # Use cp to get the permissions right first cp -fp "$1" "$1".new sed -e \ 's/Free Software Foundation\([;,]\) either version [2]/Free Software Foundation\1 either version 3/' < "$1" > "$1".new if cmp "$1" "$1".new >/dev/null then + echo "no change needed." rm -f "$1".new else rm -f "$1" && mv "$1".new "$1" + echo "done." fi } @@ -161,7 +163,6 @@ copyhack() { dst="$dst"/"$(basename $src)" fi cp -fp "$src" "$dst" && rehack "$dst" - } @@ -183,12 +184,9 @@ hack_gnulib_tool_output() { esac copyhack "${gnulibdir}"/"$file" "$dest" || exit done - - - cat > gnulib/Makefile.am <